3 Commits

Author	SHA1	Message	Date
Kyle McMartin	72b3729657	Revert "Merge branch 'kernel-git' strategy 'theirs'" ... This reverts commit a3f45c4a9c, reversing changes made to ee99a68c51.	2010-12-09 13:46:11 -05:00
Kyle McMartin	7b2f649ec2	Linux 2.6.37-rc1	2010-11-02 13:06:42 -04:00
Kyle McMartin	6406b98a0e	Snipe ACPI patch from mjg59 to fix battery levels on some laptops	2010-09-23 11:16:03 -04:00