summaryrefslogtreecommitdiff
path: root/include/linux/reboot.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-05 21:13:36 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-05 21:13:36 (GMT)
commit68762f3d8e7ea644fae1f490f9850ebf462548bd (patch)
tree81be52e9ba33fc4d8aa5f569aaab77b5a34e09ab /include/linux/reboot.h
parent4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c (diff)
parent7544b0972c1fc1a0e6c54baa1f44c81019743daa (diff)
downloadlinux-fsl-qoriq-68762f3d8e7ea644fae1f490f9850ebf462548bd.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Add TG3_FLAG_SUPPORT_MSI flag. [TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag. [TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag. [TG3]: Remove reset during MAC address changes. [TG3]: WoL fixes. [TG3]: Clear GPIO mask before storing. [TG3]: Improve NVRAM sizing. [TG3]: Fix TSO bugs. [MAC80211]: Add maintainers entry for mac80211. [MAC80211]: Add debugfs attributes. [MAC80211]: Add mac80211 wireless stack. [MAC80211]: Add generic include/linux/ieee80211.h [NETLINK]: Remove references to process ID [AF_IUCV]: Compile fix - adopt to skbuff changes.
Diffstat (limited to 'include/linux/reboot.h')
0 files changed, 0 insertions, 0 deletions