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


Trivial merge