git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c759783
29e8c3c
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Wed, 5 Mar 2008 08:33:15 +0000
(10:33 +0200)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 5 Mar 2008 08:33:15 +0000
(10:33 +0200)
Merge branches 'master' and 'linus'
Conflicts:
drivers/rtc/Kconfig
Trivial merge