Merge branch 'work-next' into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:22:28 +0000 (12:22 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:22:28 +0000 (12:22 -0800)
commit106e7cf3bd3e8112d9f36fa8a94cb12042b15bec
tree0543af47df6296cf44b55db19e92abca9172be53
parent19324328ad202b350c3803aa2bea65ff5f043d7f
parent5a2a6e1162d2c63b4bb3e6e3c867f0374e95cd1f
Merge branch 'work-next' into staging-next
drivers/staging/iio/industrialio-buffer.c