From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Oct 2010 18:47:11 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75d73126fd490e26a9bdfc2338ca068e71563e0b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'next' of git://git./linux/kernel/git/kyle/parisc-2.6

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc-agp: fix missing slab.h include
---

75d73126fd490e26a9bdfc2338ca068e71563e0b