Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Aug 2008 19:09:56 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Aug 2008 19:09:56 +0000 (12:09 -0700)
commitbba595255fa70af175f6ce4dc0cb3e7cf91f53d7
tree67517f07e9ae9b11cd4ebf384bcaeccf358c6994
parent04cde035fa47b4a7465a15db8d6eaebcc15a68af
parent6951b12a0fe7fc64789f2c4d62d2a304e93836a8
Merge branch 'core-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: fix spurious 'inconsistent lock state' warning