diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 19:04:08 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 19:04:08 +0300 |
commit | c2048b0a0a6e589d9813766489f78185cbabcdc6 (patch) | |
tree | e3245fb17e97329925d0aa0a350f604d6d3f1f71 /drivers/platform/x86/wmi.c | |
parent | de47de7404e29df8de82f5822b4fde1a6ed97b54 (diff) | |
parent | 8d7bfb4a891d606d52e1a99cf7231b4417b935dc (diff) | |
download | linux-c2048b0a0a6e589d9813766489f78185cbabcdc6.tar.xz |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] css: fix rsid evaluation for 2nd crw
[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
Diffstat (limited to 'drivers/platform/x86/wmi.c')
0 files changed, 0 insertions, 0 deletions