summaryrefslogtreecommitdiffstats
path: root/drivers/serial/sunzilog.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 23:06:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 23:06:10 +0200
commit608307e6de2631e37f55f106a7cbbc560cb12751 (patch)
tree6aff93496b1bfe5ad3d12c97a2326106628989f2 /drivers/serial/sunzilog.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
parentpkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator (diff)
downloadlinux-608307e6de2631e37f55f106a7cbbc560cb12751.tar.xz
linux-608307e6de2631e37f55f106a7cbbc560cb12751.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: (26 commits) pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator ipvs: avoid oops for passive FTP Revert "sky2: don't do GRO on second port" gro: fix different skb headrooms bridge: Clear INET control block of SKBs passed into ip_fragment(). 3c59x: Remove incorrect locking; correct documented lock hierarchy sky2: don't do GRO on second port ipv4: minor fix about RPF in help of Kconfig xfrm_user: avoid a warning with some compiler net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf() pxa168_eth: fix a mdiobus leak net sched: fix kernel leak in act_police vhost: stop worker only if created MAINTAINERS: Add ehea driver as Supported ath9k_hw: fix parsing of HT40 5 GHz CTLs ath9k_hw: Fix EEPROM uncompress block reading on AR9003 wireless: register wiphy rfkill w/o holding cfg80211_mutex netlink: Make NETLINK_USERSOCK work again. irda: Correctly clean up self->ias_obj on irda_bind() failure. wireless extensions: fix kernel heap content leak ...
Diffstat (limited to 'drivers/serial/sunzilog.c')
0 files changed, 0 insertions, 0 deletions