]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9341625 e0fb8c4)
Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2010 19:06:00 +0000 (12:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2010 19:06:00 +0000 (12:06 -0700)
* 'fixes' of ssh://master.kernel.org/~sfr/next-fixes:
  acpi: update gfp/slab.h includes
  ocfs2: update gfp/slab.h includes
  davinci: update gfp/slab.h includes
  arm: update gfp/slab.h includes
  v4l-dvb: update gfp/slab.h includes


Trivial merge
Clone of davem's net-next-2.6 tree