summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 08:24:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 08:24:15 -0800
commit4704fe65e55fb088fbcb1dc0b15ff7cc8bff3685 (patch)
treea2d27cdc42b4811a2a77f5d3e7349951a362a6a9 /arch
parent1de9d143e595aea74887c531deef8d7762ae2399 (diff)
parent7b3cc67d4445995a025a4b55a7dc687b6829b4ca (diff)
downloadlinux-4704fe65e55fb088fbcb1dc0b15ff7cc8bff3685.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 regression fix from Martin Schwidefsky: "It is a fix for a regression that has been introduced with git commit 25f269f17316 - "[S390] qdio: EQBS retry after CCQ 96" - and if possible we would like to have working code for the fcp data router in 3.3." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: [S390] qdio: fix handler function arguments for zfcp data router
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions