git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9b1c7b
6ba54ab
)
Merge branch 'omap/headers4' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:18:30 +0000
(17:18 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:18:30 +0000
(17:18 +0100)
This avoids merge conflicts between the omap header changes and the gpmc
updates.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.samba.org / sfrench / cifs-2.6.git / commitdiff