Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-10-28 09:44:56 -07:00
..
debugfs-ec	Documentation: Add new /sys/kernel/debug/ec/* files to ABI	2010-08-03 09:49:07 -04:00
debugfs-pktcdvd
ima_policy	ima: rename PATH_CHECK to FILE_CHECK	2010-02-07 03:06:23 -05:00
procfs-diskstats	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sysfs-ata	[libata] Add ATA transport class	2010-10-21 20:21:03 -04:00
sysfs-block	block: Added in stricter no merge semantics for block I/O	2010-01-29 09:04:08 +01:00
sysfs-block-zram	Staging: zram: Document sysfs entries	2010-08-31 15:34:36 -07:00
sysfs-bus-css
sysfs-bus-i2c-devices-hm6352	hmc6352: add driver for the HMC6352 compass	2010-08-09 20:45:10 -07:00
sysfs-bus-pci	PCI: export SMBIOS provided firmware instance and label to sysfs	2010-07-30 09:36:01 -07:00
sysfs-bus-pci-devices-cciss	cciss: Add usage_count attribute to each logical drive in /sys	2009-10-01 21:15:44 +02:00
sysfs-bus-umc
sysfs-bus-usb	USB: deprecate the power/level sysfs attribute	2010-05-20 13:21:37 -07:00
sysfs-bus-usb-devices-usbsevseg
sysfs-c2port
sysfs-class
sysfs-class-bdi
sysfs-class-lcd	video/lcd: document sysfs interface	2009-08-28 15:21:12 -04:00
sysfs-class-led	led: document sysfs interface	2009-08-28 15:21:12 -04:00
sysfs-class-mtd
sysfs-class-pktcdvd
sysfs-class-power	ds2760_battery: Document ABI change	2010-05-19 12:25:39 +04:00
sysfs-class-regulator
sysfs-class-uwb_rc
sysfs-class-uwb_rc-wusbhc	USB: wusb: add wusb_phy_rate sysfs file to host controllers	2009-12-11 11:55:16 -08:00
sysfs-dev
sysfs-devices
sysfs-devices-memory	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sysfs-devices-node	mm: compaction: add /sys trigger for per-node memory compaction	2010-05-25 08:06:59 -07:00
sysfs-devices-platform-_UDC_-gadget	USB: gadget: storage: optional SCSI WRITE FUA bit	2010-08-10 14:35:42 -07:00
sysfs-devices-power	PM / Runtime: Implement autosuspend support	2010-10-17 01:57:48 +02:00
sysfs-devices-system-cpu	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sysfs-devices-system-ibm-rtl	IBM Real-Time "SMI Free" mode driver -v7	2010-10-21 10:10:46 -04:00
sysfs-driver-hid-picolcd	HID: split picolcd's operation_mode sysfs attribute	2010-04-27 15:31:26 +02:00
sysfs-driver-hid-prodikeys	HID: Prodikeys PC-MIDI HID Driver	2010-05-12 15:18:59 +02:00
sysfs-driver-hid-roccat-kone	HID: roccat: remove obsolete kone_abi_version sysfs attribute	2010-06-21 15:20:35 +02:00
sysfs-driver-hid-roccat-pyra	HID: roccat: add driver for Roccat Pyra mouse	2010-09-01 12:41:17 +02:00
sysfs-firmware-acpi
sysfs-firmware-memmap
sysfs-firmware-sfi	SFI: add sysfs interface for SFI tables.	2010-05-27 12:46:20 -04:00
sysfs-firmware-sgi_uv
sysfs-fs-ext4
sysfs-gpio	gpiolib: allow poll() on value	2009-09-23 07:39:48 -07:00
sysfs-i2c-bmp085	drivers/misc: support for the pressure sensor BMP085 from Bosch Sensortec	2010-08-09 20:45:05 -07:00
sysfs-ibft
sysfs-kernel-mm
sysfs-kernel-mm-hugepages
sysfs-kernel-slab	slub: allow stats to be cleared	2009-10-15 21:34:12 +03:00
sysfs-kernel-uids
sysfs-memory-page-offline	HWPOISON: Add soft page offline support	2009-12-16 12:20:00 +01:00
sysfs-module	add Packet hub driver for Topcliff Platform controller hub	2010-10-22 10:16:42 -07:00
sysfs-ocfs2
sysfs-platform-asus-laptop	asus-laptop: set the right paths in the documentation	2010-02-28 19:35:09 +01:00
sysfs-platform-eeepc-laptop	eeepc-laptop: set the right paths in the documentation	2010-02-28 19:30:57 +01:00
sysfs-power	PM: Add sysfs attr for rechecking dev hash from PM trace	2010-10-17 01:57:50 +02:00
sysfs-pps
sysfs-profiling
sysfs-wacom	HID: wacom: add ABI doc entry for speed attribute	2010-04-23 02:14:10 +02:00
sysfs-wusb_cbaf