aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc/thinkpad_acpi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-11 16:18:58 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-11 16:18:58 -0700
commit3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45 (patch)
tree7f9cce370f5e01b0c3a5e17a230e3e9207054e7c /drivers/misc/thinkpad_acpi.h
parent75ecb1a4d148b274aa9acd1d6ccaca0a4654784e (diff)
parentcbea66d9788a344e16e161f22a6e0c4deef2c0ed (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] monwriter: Serialization bug for multithreaded applications. [S390] vmur: diag14 only works with buffers below 2GB [S390] vmur: add "top of queue" sanity check for reader open [S390] vmur: reject open on z/VM reader files with status HOLD [S390] vmur: use DECLARE_COMPLETION_ONSTACK to keep lockdep happy [S390] vmur: allocate single record buffers instead of one big data buffer [S390] remove DEFAULT_MIGRATION_COST [S390] qdio: make sure data structures are correctly aligned. [S390] hypfs: implement show_options [S390] cio: avoid memory leak on error in css_alloc_subchannel().
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
0 files changed, 0 insertions, 0 deletions