Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jun 2009 20:52:53 +0000 (13:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jun 2009 20:52:53 +0000 (13:52 -0700)
commitae937debe178b4327fd67d604ee83a20f22aa0de
treed337179b207aa5be5e47330199319dd6f421b3b7
parent9cf46a35d25debfc314dd6f090b8075bd0b7f74c
parent0419bb466f5059e40e141b1e3ab258a862ae11f0
Merge git://git./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: mn10300, setup.h
  headers_check fix: mn10300, ptrace.h