From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Jun 2009 20:52:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6
X-Git-Tag: v2.6.31-rc1~337
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ae937debe178b4327fd67d604ee83a20f22aa0de;p=karo-tx-linux.git

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: mn10300, setup.h
  headers_check fix: mn10300, ptrace.h
---

ae937debe178b4327fd67d604ee83a20f22aa0de