summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-30 11:07:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-30 11:07:53 -0700
commitfbf717629ff03f110f177d244933276423f99a27 (patch)
treea51c1d4cf8d1ce5684fb704996a8b60ee97ee9de /fs/nfsd
parent84e92ef4f7addba97ff54810d1602b47d7c00ca4 (diff)
parent810b4de25e53459323ff48957b0162b48d6cbd57 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "Here are a handful more fixes for powerpc. The irq stuff are all regression fixes, and Gavin's patch is a simple compile fix." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: tty/serial/pmac_zilog: Fix "nobody cared" IRQ message powerpc/pseries: Rivet CONFIG_EEH for pSeries platform powerpc/irqdomain: Fix broken NR_IRQ references powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions