Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[safe/jmp/linux-2.6] / drivers / power / collie_battery.c
2009-11-27 Thomas Kunzecollie: add battery driver