summaryrefslogtreecommitdiff
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-20 22:42:38 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-20 22:42:38 (GMT)
commitf6a0d9d585699d4ab634cfd26fa9ce9c7cb864a1 (patch)
tree31a9a5f572f97c869b17396be694208f30db1619 /arch/x86/Makefile
parent36231d255b8df9cb4698e9a3902c16067d5c1398 (diff)
parent78077256bc08348d587e318957ceb41fe4d4afae (diff)
downloadlinux-fsl-qoriq-f6a0d9d585699d4ab634cfd26fa9ce9c7cb864a1.tar.xz
Merge tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg KH: "Here are a few iio driver fixes for 3.11-rc2. They are still spread across drivers/iio and drivers/staging/iio so they are coming in through this tree. I've also removed the drivers/staging/csr/ driver as the developers who originally sent it to me have moved on to other companies, and CSR still will not send us the specs for the device, making the driver pretty much obsolete and impossible to fix up. Deleting it now prevents people from sending in lots of tiny codingsyle fixes that will never go anywhere. It also helps to offset the large lustre filesystem merge that happened in 3.11-rc1 in the overall 3.11.0 diffstat. :)" * tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: csr: remove driver iio: lps331ap: Fix wrong in_pressure_scale output value iio staging: fix lis3l02dq, read error handling staging:iio:ad7291: add missing .driver_module to struct iio_info iio: ti_am335x_adc: add missing .driver_module to struct iio_info iio: mxs-lradc: Remove useless check in read_raw iio: mxs-lradc: Fix misuse of iio->trig iio: inkern: fix iio_convert_raw_to_processed_unlocked iio: Fix iio_channel_has_info iio:trigger: device_unregister->device_del to avoid double free iio: dac: ad7303: fix error return code in ad7303_probe()
Diffstat (limited to 'arch/x86/Makefile')
0 files changed, 0 insertions, 0 deletions