git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fece418 6e86841)
Merge branch 'master' of /home/cbou/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Tue, 29 Jul 2008 22:05:23 +0000 (02:05 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Tue, 29 Jul 2008 22:05:23 +0000 (02:05 +0400)
Conflicts:

drivers/power/Kconfig
drivers/power/Makefile


Trivial merge
Pandora Kernel Repository