diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 06:28:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 06:28:10 +0200 |
commit | bdd4f709a1501055ccb24f204fb24dd653244fd8 (patch) | |
tree | 83d854f02dee4c2e56dbd8aad64bc9a86d52cd70 /fs/read_write.c | |
parent | mm: memcg: move pc lookup point to commit_charge() (diff) | |
parent | dell-laptop: Terminate quirks list properly (diff) | |
download | linux-bdd4f709a1501055ccb24f204fb24dd653244fd8.tar.xz linux-bdd4f709a1501055ccb24f204fb24dd653244fd8.zip |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver fixes from Matthew Garrett:
"One annoyance fix (make intel_ips stop complaining unnecessarily) and
one oops fix (unterminated list in dell-laptop). Both have been in
-next for a while with no complaints."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
dell-laptop: Terminate quirks list properly
intel_ips: Hush the i915 symbols message
Diffstat (limited to 'fs/read_write.c')
0 files changed, 0 insertions, 0 deletions