aboutsummaryrefslogtreecommitdiff
path: root/net/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2013-12-08 18:49:05 -0800
committerLinus Torvalds2013-12-08 18:49:05 -0800
commit2d4d4a8ddeb70f6d3eca23fb2f0585472368b9e5 (patch)
tree67f58eec0860fecbbf476cb82424f593ac304f6c /net/Makefile
parentf64001ef16312e94deb28297f5ffd4ada3e32ae9 (diff)
parent55ef003e4ae684d5660f984eb2352df12572d9df (diff)
Merge tag 'staging-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH: "Here are some bugfixes for the staging and IIO drivers for 3.13-rc3. The resolve the vm memory issue in the tidspbridge driver, fix a much-reported build failure in an ARM driver, and some other IIO bugfixes that have been reported" * tag 'staging-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: Staging: TIDSPBRIDGE: Use vm_iomap_memory for mmap-ing instead of remap_pfn_range Fix build failure for gp2ap020a00f.c iio: hid-sensors: Fix power and report state HID: hid-sensor-hub: Add logical min and max
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions