summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 09:27:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 09:27:44 -0800
commit981a2edd1922c00e747680f30734ea50c86af28d (patch)
treee32a9896900ea525eeb6019e618f8fa9d233d81e /drivers/power
parent4bdadb9785696439c6e2b3efe34aa76df1149c83 (diff)
parent21ec7f6dbf10492ce9a21718040677d3e68bd57d (diff)
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] fix single stepped svcs with TRACE_IRQFLAGS=y [S390] zcrypt: Do not remove coprocessor for error 8/72 [S390] sclp_vt220: set initial terminal window size [S390] use set_current_state in sigsuspend [S390] irqflags: add missing types.h include [S390] dasd: fix possible NULL pointer errors
Diffstat (limited to 'drivers/power')
0 files changed, 0 insertions, 0 deletions