]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000 (20:28 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000 (20:28 +0400)
commitdb3884632ecabc2c69dcb6b2e4001ea22350d412
treebac4953f8899d6600f4716c0bcde1e25e34c2591
parent5eaa42db109f8f5cc63b06e8bc5757b05ab3b00c
parentb7ce261485158d9ce158de689d8db6844d95d614
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/power/Makefile
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/power_supply_core.c