From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Oct 2012 18:02:02 +0000 (-0700)
Subject: Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=22054fbe7adbdd6db5cc766912ac41ab20b016ef;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'parisc-for-linus' of git://git./linux/kernel/git/jejb/parisc-2.6

Pull PARISC changes from James Bottomley:
 "This is a couple of high code motion patches (all within arch/parisc)
  I'd like to apply at -rc1 to avoid conflicts with anything else.  One
  moves us on to the generated instead of included asm file model and
  the other is a pull request from David Howells for UAPI
  disintegration.

  Signed-off-by: James Bottomley <JBottomley@Parallels.com>"

* tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  UAPI: (Scripted) Disintegrate arch/parisc/include/asm
  [PARISC] asm: redo generic includes
---

22054fbe7adbdd6db5cc766912ac41ab20b016ef