Greg Kroah-Hartman
2af10844eb
USB: Merge 2.6.37-rc5 into usb-next ...
This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-22 12:25:34 -08:00
ACPI: video: fix build for CONFIG_ACPI=n
2010-12-11 02:01:46 -05:00
asm-generic/stat.h: support 64-bit file time_t for stat()
2010-11-01 15:31:29 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
drm/i915: announce to userspace that the bsd ring is coherent
2010-12-05 10:40:39 +00:00
DNS: Separate out CIFS DNS Resolver code
2010-08-05 17:17:51 +00:00
USB: Merge 2.6.37-rc5 into usb-next
2010-12-22 12:25:34 -08:00
math-emu: correct test for downshifting fraction in _FP_FROM_INT()
2010-07-20 18:45:14 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2010-12-20 10:35:04 -08:00
mtd: Define MLC Flash as a different flash type
2010-10-25 00:50:20 +01:00
filter: fix sk_filter rcu handling
2010-12-06 09:29:43 -08:00
pcmcia: IOCARD is also required for using IRQs
2010-10-22 08:46:36 +02:00
IB/core: Add VLAN support for IBoE
2010-10-25 10:20:39 -07:00
SCSI host lock push-down
2010-11-16 13:33:23 -08:00
ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI
2010-11-24 15:29:56 +09:00
ext4: Add new ext4 inode tracepoints
2010-11-08 13:51:33 -05:00
fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define
2010-11-16 10:14:22 +09:00
xen: Provide a variant of __RING_SIZE() that is an integer constant expression
2010-12-15 12:34:28 -08:00
2af10844eb