summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 20:11:01 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 20:11:01 +0200
commit4a73a43741489a652588460e72be959e60bcb9ec (patch)
tree7479147c1832131a7c8abfcd0ee8ae1a7d07116f /drivers/serial
parentMerge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentvlan: dont drop packets from unknown vlans in promiscuous mode (diff)
downloadlinux-4a73a43741489a652588460e72be959e60bcb9ec.tar.xz
linux-4a73a43741489a652588460e72be959e60bcb9ec.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: vlan: dont drop packets from unknown vlans in promiscuous mode Phonet: Correct header retrieval after pskb_may_pull um: Proper Fix for f25c80a4: remove duplicate structure field initialization ip_gre: Fix dependencies wrt. ipv6. net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out() iwl3945: queue the right work if the scan needs to be aborted mac80211: fix use-after-free
Diffstat (limited to 'drivers/serial')
0 files changed, 0 insertions, 0 deletions