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-Tag: v2.6.37-rc1~37
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=75d73126fd490e26a9bdfc2338ca068e71563e0b

Merge branch 'next' of git://git.kernel.org/pub/scm/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