Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
commitafc1e702e8e8355faa712d4e90d9afe26a4995a5
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:50:46 +0000 (2 16:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:50:46 +0000 (2 16:50 -0700)
tree0e4dba6894652f715207f55737308cb21da3ac57
parent7b39da786a63e82d9d440075eae9018b79154d2a
parent3c48f23adada870db612a0dd3488605c4af5c0a5
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/configfs

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs:
  configfs: Fix Trivial Warning in fs/configfs/symlink.c