Commit Graph

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
1d6dcd2719 Merge 2.6.37-rc1-git10
- Pull in 2.6.37-rc1-git10 snapshot
- SECURITY_DMESG_RESTRICT added, the principle of least surprise dictates
  we should probably have it off. If you want to restrict dmesg access
  you may use the kernel.dmesg_restrict sysctl.
- linux-2.6-bluetooth-autosuspend.patch: merged upstream.
2010-11-13 22:18:22 -05:00
Matthew Garrett
2b89a044b6 Add more USB runtime power management 2010-09-17 13:47:45 -04:00