Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
alchemy	MIPS: Alchemy: Fix reset for MTX-1 and XXS1500	2011-03-14 21:07:28 +01:00
ar7	MIPS: AR7: Fix loops per jiffies on TNETD7200 devices	2010-12-16 18:10:56 +00:00
ath79	MIPS: ath79: add common WMAC device for AR913X based boards	2011-01-18 19:30:28 +01:00
bcm47xx	MIPS: BCM47xx: Swap serial console if ttyS1 was specified.	2010-12-16 18:11:00 +00:00
bcm63xx	mips: change to new flag variable	2011-03-17 14:02:56 +01:00
boot	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-10-18 13:10:36 -07:00
cavium-octeon	MIPS: Add platform device and Kconfig for Octeon USB EHCI / OHCI	2010-10-29 19:08:45 +01:00
cobalt
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
dec	set_rtc_mmss: show warning message only once	2011-01-13 08:03:07 -08:00
emma	MIPS: Ritually kill stupid printk.	2010-08-05 13:26:27 +01:00
fw	mips: change to new flag variable	2011-03-17 14:02:56 +01:00
include/asm	Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-03-17 18:40:35 -07:00
jazz	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
jz4740	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-03-20 18:14:55 -07:00
kernel	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-03-16 08:22:41 -07:00
lasat
lib	MIPS: Separate two consecutive loads in memset.S	2010-12-16 18:10:57 +00:00
loongson	MIPS: Fix always CONFIG_LOONGSON_UART_BASE=y	2011-03-14 21:07:26 +01:00
math-emu	MIPS: Fix GCC-4.6 'set but not used' warning in ieee754int.h	2011-03-14 21:07:26 +01:00
mipssim
mm	MIPS: Fix GCC-4.6 'set but not used' warning in arch/mips/mm/init.c	2011-03-14 21:07:26 +01:00
mti-malta	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
nxp/pnx8550/common
oprofile	mips: change to new flag variable	2011-03-17 14:02:56 +01:00
pci	MIPS: MSP: Fix MSP71xx bpci interrupt handler return value	2011-03-14 21:07:25 +01:00
pmc-sierra	mips: change to new flag variable	2011-03-17 14:02:56 +01:00
pnx833x	MIPS: Fix gen_nand probe structures contents	2010-08-12 12:22:49 +01:00
pnx8550	MIPS: PNX8550: Sort out machine halt, restart and powerdown functions.	2010-10-04 18:33:57 +01:00
power
powertv	mips: change to new flag variable	2011-03-17 14:02:56 +01:00
rb532	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
sgi-ip22
sgi-ip27
sgi-ip32
sibyte	MIPS: Sibyte: Use vzalloc in sbbus profiler	2011-01-18 19:30:21 +01:00
sni	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
txx9	MIPS: Use printf extension %pR for struct resource	2011-01-18 19:30:21 +01:00
vr41xx	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
wrppmc
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms	MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs	2011-01-18 19:30:24 +01:00
Kconfig	MIPS: Jz4740: Add HAVE_CLK	2011-03-14 21:07:27 +01:00
Kconfig.debug	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Makefile	mips: change to new flag variable	2011-03-17 14:02:56 +01:00