tree 03de585a0d840db316bcd93eca8882a920ae6c70
parent ed72a3d1b4acb8ace77a1049fbbcbc7edb035267
parent 6aec187a90aeb883533c9180e2acac1e54c87f7d
author Linus Torvalds <torvalds@linux-foundation.org> 1320806056 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320806056 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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