Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git] / arch / i386 / .gitignore
1 boot