summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 05:34:37 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 05:34:37 +0400
commite14f64c2079240082f3c5bf98d9ecf3dc6780338 (patch)
tree9f0c0e3d76478d28312fb4a2def479179a5548c6 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent602586a83b719df0fbd94196a1359ed35aeb2df3 (diff)
parente5093aec2e6b60c3df2420057ffab9ed4a6d2792 (diff)
downloadlinux-e14f64c2079240082f3c5bf98d9ecf3dc6780338.tar.xz
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: net: Fix a memmove bug in dev_gro_receive() net sched: fix some kernel memory leaks netfilter: {ip,ip6,arp}_tables: avoid lockdep false positive Revert "netlink: netlink_recvmsg() fix" ipv6: remove sysctl jiffies conversion on gc_elasticity and min_adv_mss xfrm: Use GFP_ATOMIC in xfrm_compile_policy ath5k: disable ASPM L0s for all cards ath9k_htc: load proper firmware for device ID 7015 wl1251: fix trigger scan timeout usage ath9k_htc: Fix disconnect issue in HT40 mode. ath9k_htc: fix panic on packet injection using airbase-ng tool. ipw2100: register pm_qos request before registering pci driver
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
0 files changed, 0 insertions, 0 deletions