Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / include / linux / dw_dmac.h

diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 6998d9376ef902781acd1c13d06ebdbbff9f56fe..4bfe0a2f7d50cc218bce24040154286a582aaf94 100644 (file)
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -3,6 +3,7 @@
  * AVR32 systems.)
  *
  * Copyright (C) 2007 Atmel Corporation
+ * Copyright (C) 2010-2011 ST Microelectronics
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as