summaryrefslogtreecommitdiff
path: root/arch/sparc/prom
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-10 15:19:07 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-10 15:19:07 (GMT)
commit909ccdb4cf9b2c3bfb803392e93c6195d2e68799 (patch)
treed06764ca1a5cb2354b8137dbdb5541ea4efdc669 /arch/sparc/prom
parent2cbd1883881ac490d93514324b947a0267c5ca96 (diff)
parent7717aefff3290c61e5f9e6aa39e9e1dc63cd4e81 (diff)
downloadlinux-fsl-qoriq-909ccdb4cf9b2c3bfb803392e93c6195d2e68799.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] Fix struct _lowcore layout. [S390] qdio: prevent call trace if CHPID is offline [S390] qdio: continue polling for buffer state ERROR
Diffstat (limited to 'arch/sparc/prom')
0 files changed, 0 insertions, 0 deletions