3f41
parent 700d4558fc947542218e6acbc20d1347981ea399
parent d280cc989ad591607e812cd5c5dfde702b5f191a
author Linus Torvalds <torvalds@linux-foundation.org> 1243868502 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243868502 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6

* 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
㙫