From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Nov 2011 02:34:16 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
X-Git-Tag: v5.15~23752
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19e0bafc36abd84a5b4d7c7745b78a6f4626e944;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/paulg/linux

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  drivers/media: video/a5k6aa is a module and so needs module.h
  mfd: fix build failures in recently added ab5500 code
  hwspinlock/u8500: include linux/module.h
  MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
---

19e0bafc36abd84a5b4d7c7745b78a6f4626e944