tree f8e7b7c8c46b537115ddf89013d0372dee19ca45
parent b77d643ced576bdd1e918aebda869de74696cde9
parent 6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3
author Linus Torvalds <torvalds@linux-foundation.org> 1288378031 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288378031 -0700

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