Colin Cross f02fac6330 Merge commit 'v3.4-rc6' into android-3.4 ...

Conflicts:
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c

Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91

2012-05-07 18:20:34 -07:00

..

netfilter

netfilter: bridge: fix wrong pointer dereference

2012-03-06 14:43:49 -05:00

br_device.c

bridge: Have tx_bytes count headers like rx_bytes.

2012-04-09 13:57:57 -07:00

br_fdb.c

bridge: BH already disabled in br_fdb_cleanup()

2012-01-17 10:17:32 -05:00

br_forward.c

set fake_rtable's dst to NULL to avoid kernel Oops

2012-04-24 00:16:24 -04:00

br_if.c

…

br_input.c

…

br_ioctl.c

…

br_multicast.c

bridge: Do not send queries on multicast group leaves

2012-04-11 09:43:13 -04:00

br_netfilter.c

set fake_rtable's dst to NULL to avoid kernel Oops

2012-04-24 00:16:24 -04:00

br_netlink.c

bridge: master device stuck in no-carrier state forever when in user-stp mode

2011-12-01 14:05:17 -05:00

br_notify.c

…

br_private_stp.h

…

br_private.h

bridge: Do not send queries on multicast group leaves

2012-04-11 09:43:13 -04:00

br_stp_bpdu.c

…

br_stp_if.c

bridge: fix state reporting when port is disabled

2012-03-08 00:25:25 -08:00

br_stp_timer.c

…

br_stp.c

bridge: br_log_state() s/entering/entered/

2012-03-08 00:25:25 -08:00

br_sysfs_br.c

…

br_sysfs_if.c

…

br.c

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

Kconfig

…

Makefile

…