summaryrefslogtreecommitdiffstats
path: root/sound/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:33:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:33:54 -0700
commita376d446771710790f5f3425172b467bf8578e22 (patch)
tree64dd36bcb3df9a4d76d31900f1967b0cc302254e /sound/Makefile
parent6847e154e3cd74fca6084124c097980a7634285a (diff)
parent252aa9d94a04252046f3a382e6aca1b5c95921d8 (diff)
downloadop-kernel-dev-a376d446771710790f5f3425172b467bf8578e22.zip
op-kernel-dev-a376d446771710790f5f3425172b467bf8578e22.tar.gz
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: Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines." skbuff.h: Fix comment for NET_IP_ALIGN drivers/net: using spin_lock_irqsave() in net_send_packet() NET: phy_device, fix lock imbalance gre: fix ToS/DiffServ inherit bug igb: gcc-3.4.6 fix atlx: duplicate testing of MCAST flag NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines. netdev: restore MTU change operation netdev: restore MAC address set and validate operations sit: fix regression: do not release skb->dst before xmit net: ip_push_pending_frames() fix net: sk_prot_alloc() should not blindly overwrite memory
Diffstat (limited to 'sound/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud