git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f456d2e ed680c4)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 4 Aug 2009 14:45:13 +0000 (17:45 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Aug 2009 14:45:13 +0000 (17:45 +0300)
Merge branches 'master' and 'linus'

Conflicts:
drivers/leds/Kconfig
drivers/leds/Makefile


Trivial merge
Pandora Kernel Repository