summaryrefslogtreecommitdiffstats
path: root/drivers/ps3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 17:43:59 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 17:43:59 +0200
commitc81eddb0e3728661d1585fbc564449c94165cc36 (patch)
treebd7dbc09bec4c1c90552718d48fb7f30b94e0265 /drivers/ps3
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parent[S390] zcore: Fix reipl device detection (diff)
downloadlinux-c81eddb0e3728661d1585fbc564449c94165cc36.tar.xz
linux-c81eddb0e3728661d1585fbc564449c94165cc36.zip
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] zcore: Fix reipl device detection [S390] vdso: use ntp adjusted clock multiplier [S390] cio: use exception-save stsch [S390] add hook to reenable mss after hibernation [S390] cio: allow enable_facility from outside init functions [S390] dasd: fix endless loop in erp
Diffstat (limited to 'drivers/ps3')
0 files changed, 0 insertions, 0 deletions