From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2012 02:03:30 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers
X-Git-Tag: v3.3-rc1~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca88ad6915b65f6e037f8c3e632fcd92a70bd88;p=pandora-kernel.git

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

* 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
  UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
  UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
  UAPI: Make linux/patchkey.h easier to parse
  UAPI: Fix nested __KERNEL__ guards in video/edid.h
  UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
  UAPI: Guard linux/cuda.h
  UAPI: Guard linux/pmu.h
  UAPI: Guard linux/isdn_divertif.h
  UAPI: Guard linux/sound.h
  UAPI: Rearrange definition of HZ in asm-generic/param.h
  UAPI: Make FRV use asm-generic/param.h
  UAPI: Make M32R use asm-generic/param.h
  UAPI: Make MN10300 use asm-generic/param.h
  UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
  UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
  UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
---

dca88ad6915b65f6e037f8c3e632fcd92a70bd88
Reading git-diff-tree failed