summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-12-27 01:05:07 +0300
committerLen Brown <len.brown@intel.com>2010-12-27 01:05:07 +0300
commitbbbcde9d9614683fbeb41f00728cfbfb7f75a7ad (patch)
treeaa085801b7b1203c171c7f999d0a26a4105ba4ec /drivers
parentd7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff)
parent5acdb1af907d5908b4942d425c0983f353dd8fc5 (diff)
parentcde44d1740bcb3dcfecbf792a71826431e61686e (diff)
downloadlinux-bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad.tar.xz
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release