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	3daa57b3d9	Linux 2.6.36-git8	2010-10-26 13:05:04 -04:00
Kyle McMartin	9ecbc015d1	fix ima patch, and add xhci_hcd suspend resume backport	2010-10-18 13:40:37 -04:00