From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Oct 2012 02:21:15 +0000 (+0900)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.7-rc1~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b6897130f0ac8ac33043be736770eb5f58164044;p=~emulex%2Finfiniband.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc uapi disintegration from Benjamin Herrenschmidt.

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
---

b6897130f0ac8ac33043be736770eb5f58164044