projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 822e521 32385c7)
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)
* '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

1  2 
fs/namei.c patch | diff1 | diff2 | blob | history
kernel/cgroup.c patch | diff1 | diff2 | blob | history

diff --cc fs/namei.c
Simple merge
diff --cc kernel/cgroup.c
Simple merge
John Crispins staging tree