• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · d79df0b1
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits)
      Staging: ramzswap: Handler for swap slot free callback
      swap: Add swap slot free callback to block_device_operations
      swap: Add flag to identify block swap devices
      Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one
      Staging: vt6655: use ETH_DATA_LEN macro instead of custom one
      Staging: vt6655: use ETH_FCS_LEN macro instead of custom one
      Staging: vt6656: use ETH_HLEN macro instead of custom one
      Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.
      Staging: dt3155v4l: remove private memory allocator
      Staging: crystalhd: Remove typedefs from driver
      Staging: winbond: Fix for pointer name format issue in mds.c
      Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs
      Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs
      Staging: comedi: Altered the way printk is used in 8255.c
      staging: iio: adis16350 and similar IMU driver
      Staging: iio: max1363 Fix two bugs in single_channel_from_ring
      Staging: iio: adis16220 extract bin_attribute structures from state
      Staging: iio: adis16220 vibration sensor driver
      Staging: comedi: Kconfig dependancy fixes
      Staging: comedi: fix up build error from last Kconfig changes
swapfile.c 63.6 KB