aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 11:47:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 11:47:11 -0700
commit75d73126fd490e26a9bdfc2338ca068e71563e0b (patch)
treef8e7b7c8c46b537115ddf89013d0372dee19ca45 /kernel
parentb77d643ced576bdd1e918aebda869de74696cde9 (diff)
parent6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3 (diff)
downloadmrst-s0i3-test-75d73126fd490e26a9bdfc2338ca068e71563e0b.tar.gz
mrst-s0i3-test-75d73126fd490e26a9bdfc2338ca068e71563e0b.tar.xz
mrst-s0i3-test-75d73126fd490e26a9bdfc2338ca068e71563e0b.zip
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions