summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_vlan.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-09 20:27:01 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-09 20:27:01 +0200
commitb8889c4fc6ba03e289cec6a4d692f6f080a55e53 (patch)
tree45078625e0bfd865489b297d84eed17983d6d538 /net/bridge/br_vlan.c
parentMerge tag 'for-linus-20150909' of git://git.infradead.org/linux-mtd (diff)
parentRevert "uart: pl011: Rename regs with enumeration" (diff)
downloadlinux-b8889c4fc6ba03e289cec6a4d692f6f080a55e53.tar.xz
linux-b8889c4fc6ba03e289cec6a4d692f6f080a55e53.zip
Merge tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty driver reverts from Greg KH: "Here are some reverts for some tty patches (specifically the pl011 driver) that ended up breaking a bunch of machines (i.e. almost all of the ones with this chip). People are working on a fix for this, but in the meantime, it's best to just revert all 5 patches to restore people's serial consoles. These reverts have been in linux-next for many days now" * tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "uart: pl011: Rename regs with enumeration" Revert "uart: pl011: Introduce register accessor" Revert "uart: pl011: Introduce register look up table" Revert "uart: pl011: Improve LCRH register access decision" Revert "uart: pl011: Add support to ZTE ZX296702 uart"
Diffstat (limited to 'net/bridge/br_vlan.c')
0 files changed, 0 insertions, 0 deletions