aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-27 10:11:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-27 10:11:12 -0700
commita2508c0814c6d2c0259fa859a6184343b1e39ea3 (patch)
tree3c42cb3daf50b419f8cc20ff1625647306b66e0d /fs
parent0f5a2c553d1484141ebb369ecab61894e9cb074f (diff)
parent6ee4e28be80add86a64908472e4b7ab01dab33d9 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix build-warning in io-unit.c [SPARC64]: Fix BACKOFF_SPIN on non-SMP. [SPARC32]: __inline__ --> inline [SPARC64]: __inline__ --> inline
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions