Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 18:47:11 +0000 (11:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 18:47:11 +0000 (11:47 -0700)
commit75d73126fd490e26a9bdfc2338ca068e71563e0b
treef8e7b7c8c46b537115ddf89013d0372dee19ca45
parentb77d643ced576bdd1e918aebda869de74696cde9
parent6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3
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