Linus Torvalds 01539ba2a7 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits) omap2: Make OMAP2PLUS select OMAP_DM_TIMER OMAP4: hwmod data: Fix alignment and end of line in structurefields OMAP4: hwmod data: Move the DMA structures OMAP4: hwmod data: Move the smartreflex structures OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc arm: omap: tusb6010: add name for MUSB IRQ arm: omap: craneboard: Add USB EHCI support omap2+: Initialize serial port for dynamic remuxing for n8x0 omap2+: Add struct omap_board_data and use it for platform level serial init omap2+: Allow hwmod state changes to mux pads based on the state changes omap2+: Add support for hwmod specific muxing of devices omap2+: Add omap_mux_get_by_name OMAP2: PM: fix compile error when !CONFIG_SUSPEND MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership OMAP4: Smartreflex framework extensions OMAP4: hwmod: Add inital data for smartreflex modules. OMAP4: PM: Program correct init voltages for scalable VDDs OMAP4: Adding voltage driver support OMAP4: Register voltage PMIC parameters with the voltage layer OMAP3: PM: Program correct init voltages for VDD1 and VDD2 ... Fix up trivial conflict in arch/arm/plat-omap/Kconfig		2011-01-06 19:13:58 -08:00
..
acpi	ACPI: video: fix build for CONFIG_ACPI=n	2010-12-11 02:01:46 -05:00
asm-generic	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
crypto	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	drm/i915: announce to userspace that the bsd ring is coherent	2010-12-05 10:40:39 +00:00
keys
linux	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2011-01-06 19:13:58 -08:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-01-06 18:32:12 -08:00
mtd	mtd: Define MLC Flash as a different flash type	2010-10-25 00:50:20 +01:00
net	netfilter: fix the race when initializing nf_ct_expect_hash_rnd	2011-01-06 11:22:20 -08:00
pcmcia
rdma	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
rxrpc
scsi	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
sound	ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI	2010-11-24 15:29:56 +09:00
trace	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
video	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
xen	xen: Provide a variant of __RING_SIZE() that is an integer constant expression	2010-12-15 12:34:28 -08:00
Kbuild