Merge branch 'work-next' into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:16:43 +0000 (12:16 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:16:43 +0000 (12:16 -0800)
commit19324328ad202b350c3803aa2bea65ff5f043d7f
tree17809e1e8ad50b009f9dab7df6c31979393087ed
parent5f070a36d62e27f55dcdcee735da683fe85bc10f
parenta1e44d6ac5577b78ec85833b22d58345b2758ebb
Merge branch 'work-next' into staging-next
drivers/staging/iio/ring_sw.c