Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 17:08:29 +0000 (09:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 17:08:29 +0000 (09:08 -0800)
commitacda4721ae876dedab3fef04bbd8020bfa67ff0a
treeec48d554fe48b3915912e2ae62bc962ade0553bd
parent822e5215f9eef86c1dd56d5696bf55a212b0e3f0
parent32385c7cf60a78375b63afc4f02001df84dfd1a0
Merge branch 'vfs-scale-working' of git://git./linux/kernel/git/npiggin/linux-npiggin

* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin:
  kernel: fix hlist_bl again
  cgroups: Fix a lockdep warning at cgroup removal
  fs: namei fix ->put_link on wrong inode in do_filp_open
fs/namei.c
kernel/cgroup.c