]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2009 15:01:42 +0000 (08:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2009 15:01:42 +0000 (08:01 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
  headers_check fix: linux/net_dropmon.h
  headers_check fix: linux/auto_fs.h


Trivial merge