summaryrefslogtreecommitdiff
path: root/include/linux/screen_info.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-03 05:11:52 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-03 05:11:52 +0300
commit2a2a5660f10a468016fed594ab09d77ef0bb6079 (patch)
tree7990efd295869854bfb3de100628206c3682dbf9 /include/linux/screen_info.h
parentca0bf64d99f6e3f6e2fe2585e52a0ac57354beac (diff)
parentf98bfbd78c37c5946cc53089da32a5f741efdeb7 (diff)
downloadlinux-2a2a5660f10a468016fed594ab09d77ef0bb6079.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: (23 commits) connector: Delete buggy notification code. be2net: use eq-id to calculate cev-isr reg offset Bluetooth: Use the control channel for raw HID reports Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011 Bluetooth: Redo checks in IRQ handler for shared IRQ support Bluetooth: Fix memory leak in L2CAP Bluetooth: Remove double free of SKB pointer in L2CAP cdc_ether: Partially revert "usbnet: Set link down initially ..." be2net: Fix memset() arg ordering. bonding: bond_open error return value ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early ixgbe: set the correct DCB bit for pg tx settings igbvf: fix issue w/ mapped_as_page being left set after unmap drivers/net: ks8851_mll ethernet network driver be2net: Bug fix to support newer generation of BE ASIC starfire: clean up properly if firmware loading fails mac80211: fix NULL pointer dereference when ftrace is enabled netfilter: ctnetlink: fix expectation mask dump ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure ath9k: fix eeprom INI values override for 2GHz-only cards ...
Diffstat (limited to 'include/linux/screen_info.h')
0 files changed, 0 insertions, 0 deletions