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)
commit9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6
tree74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5
parentfece418418f51e92dd7e67e17c5e3fe5a28d3279
parent6e86841d05f371b5b9b86ce76c02aaee83352298
Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/power_supply_sysfs.c