Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/mips
History
Mark Brown 18d4ed4342 Merge branch 'for-3.1' into for-3.2 
Conflict due to the fix for the register map failure - taken the for-3.1
version.

Conflicts:
	sound/soc/codecs/sgtl5000.c
2011-08-08 14:56:19 +09:00
..
alchemy ASoC: au1x: update db1200 machine to the new way of things 2011-07-27 19:16:47 +01:00
ar7 MIPS: AR7: Replace __attribute__((__packed__)) with __packed 2011-07-25 17:23:20 +01:00
ath79 USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs 2011-04-13 16:58:19 -07:00
bcm47xx Update my e-mail address 2011-07-07 15:18:01 +02:00
bcm63xx SSB: Change fallback sprom to callback mechanism. 2011-05-19 09:55:47 +01:00
boot MIPS: Alchemy: Rewrite UART setup and constants. 2011-05-19 09:55:45 +01:00
cavium-octeon Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
cobalt i8253: Create linux/i8253.h and use it in all 8253 related files 2011-06-09 15:01:37 +02:00
configs rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
dec MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
emma MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
fw Merge branch 'master' into for-next 2011-04-26 10:22:59 +02:00
include/asm atomic: cleanup asm-generic atomic*.h inclusion 2011-07-26 16:49:47 -07:00
jazz i8253: Create linux/i8253.h and use it in all 8253 related files 2011-06-09 15:01:37 +02:00
jz4740 Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-05-19 17:44:13 -07:00
kernel atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
lantiq Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2011-07-26 14:17:28 -07:00
lasat MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
lib MIPS: Kconfig and Makefile update for Netlogic XLR/XLS 2011-05-19 09:55:40 +01:00
loongson MIPS: Remove pointless return statement from empty void functions. 2011-07-25 17:26:55 +01:00
math-emu perf: Remove the nmi parameter from the swevent and overflow interface 2011-07-01 11:06:35 +02:00
mipssim atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mm Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2011-07-26 14:17:28 -07:00
mti-malta Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2011-07-26 14:17:28 -07:00
netlogic MIPS: Netlogic: SMP fixes for XLR/XLS platform code. 2011-07-20 23:12:11 +01:00
nxp/pnx8550/common MIPS: Remove pointless return statement from empty void functions. 2011-07-25 17:26:55 +01:00
oprofile MIPS: oprofile: Add callgraph support 2011-06-15 14:35:34 +02:00
pci Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2011-07-26 14:17:28 -07:00
pmc-sierra MIPS: Malta: Fix crash in SMP kernel on non-CMP systems. 2011-07-20 23:12:10 +01:00
pnx833x Fix common misspellings 2011-03-31 11:26:23 -03:00
pnx8550 MIPS: Remove pointless return statement from empty void functions. 2011-07-25 17:26:55 +01:00
power MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb 2011-05-10 18:15:26 +01:00
powertv treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
rb532 MIPS: RB532: Use hex_to_bin() 2011-07-25 17:26:56 +01:00
sgi-ip22 i8253: Create linux/i8253.h and use it in all 8253 related files 2011-06-09 15:01:37 +02:00
sgi-ip27 atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
sgi-ip32 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sibyte MIPS: SB1250: Restore dropped irq_mask function 2011-07-20 23:12:11 +01:00
sni i8253: Create linux/i8253.h and use it in all 8253 related files 2011-06-09 15:01:37 +02:00
txx9 Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
vr41xx mips: vr41xx: Use irdq_irq_disabled() 2011-03-29 14:48:07 +02:00
wrppmc
Kbuild MIPS: Repair Kbuild make clean breakage. 2010-10-19 18:32:39 +01:00
Kbuild.platforms MIPS: XLR, XLS: Move makefile bits to were they belong. 2011-07-20 23:12:11 +01:00
Kconfig virtio: expose for non-virtualization users too 2011-07-23 16:20:30 +09:30
Kconfig.debug lib: consolidate DEBUG_STACK_USAGE option 2011-05-25 08:39:54 -07:00
Makefile MIPS: XLR, XLS: Move makefile bits to were they belong. 2011-07-20 23:12:11 +01:00