git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
590d829
280ad7f
7eca30a
)
Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 2 Mar 2012 13:14:02 +0000
(13:14 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 2 Mar 2012 13:22:19 +0000
(13:22 +0000)
These two branches are a dependency for the at91 device tree changes,
so we pull them in here. at91/base2+cleanup will get merged through
the arm-soc cleanup2 branch, while the irqdomain tree will be sent
by Grant before this one gets integrated.
Conflicts:
drivers/rtc/rtc-at91sam9.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge