Jamie Iles
e5ea3f12d4
gpio/basic_mmio: add missing include of spinlock_types.h ...
include/linux/basic_mmio_gpio.h uses a spinlock_t without including any
of the spinlock headers resulting in this compiler warning.
include/linux/basic_mmio_gpio.h:51:2: error: expected specifier-qualifier-list before 'spinlock_t'
Explicitly include linux/spinlock_types.h to fix it.
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-06-10 08:46:26 -06:00
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
2011-05-29 04:38:48 -04:00
asm-generic/unistd.h: support sendmmsg syscall
2011-06-02 14:31:38 -04:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-05-24 12:06:40 -07:00
gpio/basic_mmio: add missing include of spinlock_types.h
2011-06-10 08:46:26 -06:00
[media] Add missing include guard to header file
2011-05-25 21:42:30 -03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-06-04 23:16:00 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-05-26 12:13:57 -07:00
[SCSI] libsas: Add option for SATA soft reset
2011-05-26 22:49:33 -05:00
[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
2011-05-24 13:02:42 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-06-04 23:16:00 +09:00
Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-05-24 15:49:57 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem
2011-05-26 10:50:56 -07:00
e5ea3f12d4