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)
commit8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0
tree4f5f771f66a9b223b116742a8a04019cad287a4f
parent93416253073511716f7e70c06e32c3810c3deac4
parente0fb8c418520b41d57667befdb8861c46cdf69e0
Merge branch 'fixes' of ssh:///~sfr/next-fixes

* '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