q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/mips
History
Ralf Baechle 0863be2e8e MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict. 
Patch 14275ccdb1e4b487cca745aba994699c426a31ee and
d5dedd4507 are conflicting and the
conflict was resolved badly in merge
92241940be501f798cb21db344bbb3d1ec3c4f1c resulting in the BCM1480 changes
of 14275ccdb1e4b487cca745aba994699c426a31ee getting lost.  Sort out the
damage.

Reported and initial patch by Mark Mason <mmason@upwardaccess.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-09-30 21:46:59 +02:00
..
alchemy cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL.: mips 2009-09-24 09:34:36 +09:30
ar7 MIPS: AR7: Make board code register ar7_wdt as a platform device 2009-09-17 20:07:48 +02:00
basler/excite platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
bcm47xx MIPS: WGT634U: Add reset button support 2008-10-15 12:46:51 +01:00
bcm63xx MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART. 2009-09-30 21:46:59 +02:00
boot MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
cavium-octeon MIPS: Octeon: Move some platform device registration to its own file. 2009-09-17 20:07:52 +02:00
cobalt Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
configs MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
dec Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-18 09:15:24 -07:00
emma MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
fw MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
gt64120/wrppmc Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
include/asm MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART. 2009-09-30 21:46:59 +02:00
jazz MIPS: Jazz: Fix read buffer overflow 2009-08-03 17:52:47 +01:00
kernel MIPS: SMTC: Remove duplicate structure field initialization 2009-09-30 21:46:59 +02:00
lasat sysctl: remove "struct file *" argument of ->proc_handler 2009-09-24 07:21:04 -07:00
lib MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel 2009-06-17 11:06:24 +01:00
loongson loongson: fix cut-and-paste mis-merge 2009-09-20 15:57:28 -07:00
math-emu MIPS: Switch FPU emulator trap to BREAK instruction. 2008-10-30 14:44:34 +00:00
mipssim cpumask: arch_send_call_function_ipi_mask: mips 2009-09-24 09:34:45 +09:30
mm cpumask: use mm_cpumask() wrapper: mips 2009-09-24 09:34:51 +09:30
mti-malta cpumask: arch_send_call_function_ipi_mask: mips 2009-09-24 09:34:45 +09:30
nxp MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
oprofile MIPS: Loongson2: Fix typo "enalbe" -> "enable" 2009-09-30 21:46:59 +02:00
pci MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
pmc-sierra cpumask: arch_send_call_function_ipi_mask: mips 2009-09-24 09:34:45 +09:30
power MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE. 2009-09-17 20:07:48 +02:00
rb532 MIPS: RB532: Check irq number when handling GPIO interrupts 2009-06-17 11:06:27 +01:00
sgi-ip22 MIPS: IP22, IP28: Build with -Werror 2009-09-17 20:07:44 +02:00
sgi-ip27 cpumask: arch_send_call_function_ipi_mask: mips 2009-09-24 09:34:45 +09:30
sgi-ip32 MIPS: IP32: Remove unnecessary if not even harmful volatile keywords. 2009-05-22 13:52:06 +01:00
sibyte MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict. 2009-09-30 21:46:59 +02:00
sni timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
txx9 MIPS: TXx9: Fix error handling. 2009-09-17 20:07:43 +02:00
vr41xx Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
Kconfig MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
Kconfig.debug MIPS: Kconfig: Fix the arch-specific header path 2008-12-12 18:12:23 +00:00
Makefile arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 2009-09-20 12:28:22 +02:00