Ingo Molnar 90edf27fb8 Merge branch 'linus' into perf/core ... Conflicts: kernel/hw_breakpoint.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-09-22 18:45:01 +02:00
..
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-09-07 16:00:17 -07:00
asm-generic	Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core	2010-09-15 10:27:31 +02:00
crypto
drm	drm: Use a nondestructive mode for output detect when polling (v2)	2010-09-14 20:38:48 +10:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	Merge branch 'linus' into perf/core	2010-09-22 18:45:01 +02:00
math-emu
media	V4L/DVB: cx2341x: convert to the control framework	2010-08-08 23:43:05 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	tcp: Prevent overzealous packetization by SWS logic.	2010-09-15 12:01:44 -07:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound	ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)	2010-08-18 15:10:59 +02:00
trace	tracing, perf: Add more power related events	2010-09-17 09:10:43 +02:00
video	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild