Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:06 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:06 +0000 (16:46 -0700)
commit691c5f7374ee3d48fd2c838261820a06e4be9043
treec9fb4f9f62fd27409b35e6d217faecbc722cb7dd
parentfbdbf8389976b9f40d36f21985be28a0f438f779
parentdee865656f2d8b866f8ac22c60d6363b914e9f12
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-quota-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
  quota: Silence lockdep on quota_on