linux/arch/mips
Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
alchemy 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
ar7 MIPS: AR7: Fix GPIO register size for Titan variant. 2011-05-18 14:18:27 +01:00
ath79 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
bcm47xx MIPS: BCM47xx: Extend the filling of SPROM from NVRAM 2011-05-19 09:55:47 +01: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 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
cobalt MIPS: Move Cobalt Makefile parts to their own Platform file 2010-08-05 13:25:47 +01:00
configs MIPS: Fix build warnings on defconfigs 2011-05-19 09:55:49 +01: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 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm 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
jazz MIPS: Jazz: Fix GCC 4.6.0 build error 2011-05-10 18:15:23 +01: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 extable, core_kernel_data(): Make sure all archs define _sdata 2011-05-20 08:56:56 +02:00
lantiq MIPS: Lantiq: Add etop board support 2011-05-19 09:55:43 +01: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 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
math-emu Fix common misspellings 2011-03-31 11:26:23 -03:00
mipssim MIPS: SMTC: Move declaration of smtc_init_secondary to <asm/smtc.h>. 2011-03-25 18:45:13 +01:00
mm MIPS: Move arch_get_unmapped_area and gang to new file. 2011-05-19 09:55:49 +01:00
mti-malta Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-05-19 17:41:22 -07:00
netlogic MIPS: XLR, XLS: Add PCI support. 2011-05-19 09:55:41 +01:00
nxp/pnx8550/common MIPS: PNX8550: Move code one directory level up. 2010-08-05 13:25:56 +01:00
oprofile mips: change to new flag variable 2011-03-17 14:02:56 +01:00
pci MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
pmc-sierra Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-05-19 17:41:22 -07:00
pnx833x Fix common misspellings 2011-03-31 11:26:23 -03:00
pnx8550 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
power MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb 2011-05-10 18:15:26 +01:00
powertv MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
rb532 MIPS: RB532: Fix iomap resource size miscalculation. 2011-05-18 14:18:26 +01:00
sgi-ip22 MIPS: IP22: Fix GCC 4.6.0 build error 2011-05-10 18:15:22 +01:00
sgi-ip27 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
sgi-ip32 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sibyte sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
sni MIPS: SNI: Fix GCC 4.6.0 build error 2011-05-10 18:15:23 +01:00
txx9 ethtool: Call ethtool's get/set_settings callbacks with cleaned data 2011-04-29 14:01:30 -07:00
vr41xx mips: vr41xx: Use irdq_irq_disabled() 2011-03-29 14:48:07 +02:00
wrppmc MIPS: WRPPMC: Migrate to new platform makefile style. 2010-08-05 13:25:51 +01:00
Kbuild MIPS: Repair Kbuild make clean breakage. 2010-10-19 18:32:39 +01:00
Kbuild.platforms MIPS: Lantiq: Add initial support for Lantiq SoCs 2011-05-19 09:55:41 +01:00
Kconfig 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
Kconfig.debug kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
Makefile MIPS: Kconfig and Makefile update for Netlogic XLR/XLS 2011-05-19 09:55:40 +01:00