黄涛 a01580d71e Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36 ...

Conflicts:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/wireless/bcm4329/dhd_common.c
	drivers/net/wireless/bcm4329/dhd_custom_gpio.c

2011-08-01 00:17:16 +08:00

..

9p

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

802

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-11 14:53:53 -07:00

8021q

vlan: Avoid hwaccel vlan packets when vid not used.

2010-12-09 13:33:29 -08:00

appletalk

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-11 14:53:53 -07:00

atm

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:01:15 +08:00

ax25

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

bluetooth

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

bridge

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

caif

caif: fix two caif_connect() bugs

2010-10-05 20:35:53 -07:00

can

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

core

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

dcb

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dccp

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

decnet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

dns_resolver

DNS: If the DNS server returns an error, allow that to be cached [ver #2]

2010-08-11 17:11:28 +00:00

dsa

phylib: available for any speed ethernet

2010-08-11 23:03:50 -07:00

econet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

ethernet

Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue

2010-07-14 18:27:09 -07:00

ieee802154

ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc

2010-05-23 23:11:07 -07:00

ipv4

Revert "Paranoid network."

2011-07-30 22:57:39 +08:00

ipv6

Revert "Paranoid network."

2011-07-30 22:57:39 +08:00

ipx

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

irda

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

iucv

net: use __packed annotation

2010-06-03 03:21:52 -07:00

key

pfkey: add severity to printk

2010-05-17 23:23:13 -07:00

l2tp

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

2011-01-07 17:20:53 -08:00

lapb

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

llc

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

mac80211

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

netfilter

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

netlabel

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

netlink

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

netrom

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

packet

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

phonet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

rds

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

rfkill

Revert "rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down"

2011-07-30 22:41:11 +08:00

rose

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

rxrpc

Add a dummy printk function for the maintenance of unused printks

2010-08-12 09:51:35 -07:00

sched

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

sctp

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

sunrpc

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

tipc

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

unix

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

wanrouter

net: autoconvert trivial BKL users to private mutex

2010-07-12 20:21:47 -07:00

wimax

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

wireless

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

x25

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

xfrm

xfrm: Allow different selector family in temporary state

2010-09-20 11:11:38 -07:00

activity_stats.c

net: activity_stats: Add statistics for network transmission activity

2010-09-29 17:49:37 -07:00

compat.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

Kconfig

Revert "Paranoid network."

2011-07-30 22:57:39 +08:00

Makefile

net: activity_stats: Add statistics for network transmission activity

2010-09-29 17:49:37 -07:00

nonet.c

[PATCH] Make most file operations structs in fs/ const

2006-03-28 09:16:06 -08:00

socket.c

Revert "uidstat: Adding uid stat driver to collect network statistics."

2011-07-30 22:57:02 +08:00

sysctl_net.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

TUNABLE

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00