summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-02-21 22:01:43 -0500
committerLen Brown <len.brown@intel.com>2009-02-21 22:01:43 -0500
commit5acfac5a6473b459ed38c0edf515be030f3b5874 (patch)
treeedeb4d26043f6147d0451e313487482ed3391b8d /drivers
parent5423a0cb3f74c16e90683f8ee1cec6c240a9556e (diff)
parent56f382a08722186623400180adbb9d1be1721cee (diff)
parentba193d64abfe644e8752affa310a368eda01f46e (diff)
parent6defa2fe2019f3729933516fba5cfd75eecd07de (diff)
downloadlinux-3.10-5acfac5a6473b459ed38c0edf515be030f3b5874.tar.gz
linux-3.10-5acfac5a6473b459ed38c0edf515be030f3b5874.tar.bz2
linux-3.10-5acfac5a6473b459ed38c0edf515be030f3b5874.zip
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release