linux/arch/mips/configs
Linus Torvalds 038a5008b2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-11 19:40:14 -07:00
..
atlas_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
bigsur_defconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-11 19:40:14 -07:00
capcella_defconfig [MIPS] Update capcella_defconfig 2007-08-27 02:16:56 +01:00
cobalt_defconfig [MIPS] Cobalt: Add LED support to cobalt_defconfig 2007-10-11 23:46:13 +01:00
db1000_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
db1100_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
db1200_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
db1500_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
db1550_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
decstation_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
e55_defconfig [MIPS] Update e55_defconfig 2007-08-27 02:16:56 +01:00
emma2rh_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
excite_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
fulong_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
ip22_defconfig [MIPS] Update a few defconfigs. 2007-08-27 02:16:55 +01:00
ip27_defconfig [MIPS] Update a few defconfigs. 2007-08-27 02:16:55 +01:00
ip32_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
jazz_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
jmr3927_defconfig [MIPS] Update defconfigs for TX39/TX49 2007-08-27 02:16:53 +01:00
lasat_defconfig [MIPS] Add back support for LASAT platforms 2007-10-11 23:46:00 +01:00
malta_defconfig [MIPS] Update a few defconfigs. 2007-08-27 02:16:55 +01:00
mipssim_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
mpc30x_defconfig [MIPS] Update mpc30x_defconfig 2007-08-27 02:16:56 +01:00
msp71xx_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
mtx1_defconfig [MIPS] MTX1: Add defconfig file 2007-10-11 23:46:13 +01:00
pb1100_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
pb1500_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
pb1550_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
pnx8550-jbs_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
pnx8550-stb810_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
qemu_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
rbhma4200_defconfig [MIPS] Update defconfigs for TX39/TX49 2007-08-27 02:16:53 +01:00
rbhma4500_defconfig [MIPS] Update defconfigs for TX39/TX49 2007-08-27 02:16:53 +01:00
rm200_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
sb1250-swarm_defconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-11 19:40:14 -07:00
sead_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
tb0219_defconfig [MIPS] Update tb0219_defconfig 2007-08-27 02:16:57 +01:00
tb0226_defconfig [MIPS] Update tb0226_defconfig 2007-08-27 02:16:57 +01:00
tb0287_defconfig [MIPS] Update tb0287_defconfig 2007-08-27 02:16:57 +01:00
workpad_defconfig [MIPS] Update workpad_defconfig 2007-08-27 02:16:58 +01:00
wrppmc_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00
yosemite_defconfig [MIPS] DDB5477: Remove support 2007-07-31 21:35:34 +01:00