From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jun 2010 19:06:00 +0000 (-0700)
Subject: Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes
X-Git-Tag: firefly_0821_release~9833^2~1491
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0;p=firefly-linux-kernel-4.4.55.git

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

8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0