1f3a8e093f470ef193b0ca6011d90180331c8b53 |
|
23-May-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits) staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_ staging:iio: Trivial kconfig reorganization and uniformity improvements. staging:iio:documenation partial update. staging:iio: use pollfunc allocation helpers in remaining drivers. staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out. staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev. staging:iio:meter:ade7758: Use private data space from iio_allocate_device staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value. staging:iio: ring core cleanups + check if read_last available in lis3l02dq staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name. staging:iio: poll func allocation clean up. staging:iio:ad7780 trivial unused header cleanup. staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes staging:iio:adc:AD7780: Convert to new channel registration method staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv() staging:iio:adc: AD7606: Consitently use indio_dev staging:iio: Rip out helper for software rings. staging:iio:adc:AD7298: Use private data space from iio_allocate_device staging:iio: rationalization of different buffer implementation hooks. staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev. ... Fix up trivial conflicts in - drivers/staging/intel_sst/intelmid.c: patches applied in both branches - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
|
c6cdaded146875e2e47e946f6592c1775eaee849 |
|
13-Apr-2011 |
Jeff Mahoney <jeffm@suse.com> |
staging: rts_pstor: Add <linux/vmalloc.h> There are a few files in the rts_pstor driver that use vmalloc/vfree without including the header for it. This patch adds <linux/vmalloc.h> to those files. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/drivers/staging/rts_pstor/xd.c
|
389fe985f27b5334110639146016bb6dd273c3f6 |
|
27-Mar-2011 |
Alexander Beregalov <a.beregalov@gmail.com> |
Staging: rts_pstor: s/rtsx_alloc_dma_buf/kmalloc/ Replace rtsx_alloc_dma_buf() with kfree() back, chip parameter is not used; remove casts. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/drivers/staging/rts_pstor/xd.c
|
f7468e2995dbd914817c780941750f0ac668ac50 |
|
26-Mar-2011 |
Alexander Beregalov <a.beregalov@gmail.com> |
Staging: rts_pstor: s/rtsx_free_dma_buf/kfree/ Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/drivers/staging/rts_pstor/xd.c
|
0838b87cae7e81e497218b5eba3c8e9ca6f3ddbe |
|
01-Feb-2011 |
Timo von Holtz <tvh@informatik.uni-kiel.de> |
Staging: rts_pstor: fixed some brace code styling issues Fixed all brace coding style issues in the following files: drivers/staging/rts_pstor/rtsx_card.h drivers/staging/rts_pstor/spi.c drivers/staging/rts_pstor/trace.h drivers/staging/rts_pstor/xd.c Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/drivers/staging/rts_pstor/xd.c
|
77d89b08766c878a2594b15d203e513acf952340 |
|
21-Jan-2011 |
wwang <wei_wang@realsil.com.cn> |
staging: add rts_pstor for Realtek PCIE cardreader rts_pstor is used to support Realtek PCI-E card readers, including rts5209, rts5208, Barossa. Signed-off-by: wwang <wei_wang@realsil.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/drivers/staging/rts_pstor/xd.c
|