tree ac28a7cf89fbcad8cc18f71c041c520d216ec091
parent e91b3b2681148371d84b9cdf4cab6f9de0522544
parent 6e85c5ba73c07b990798087e9b858c065db2b234
author Linus Torvalds <torvalds@linux-foundation.org> 1241550500 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241550500 -0700

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/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:
  kernel/posix-cpu-timers.c: fix sparse warning
  dma-debug: remove broken dma memory leak detection for 2.6.30
  locking: Documentation: lockdep-design.txt, fix note of state bits