]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed72a3d 6aec187)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Nov 2011 02:34:16 +0000 (18:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Nov 2011 02:34:16 +0000 (18:34 -0800)
* '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

1  2 
drivers/hwspinlock/u8500_hsem.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hwspinlock/u8500_hsem.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.