Linus Torvalds 949f6711b8 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: (510 commits) staging: speakup: fix failure handling staging: usbip: remove double giveback of URB Staging: batman-adv: Remove batman-adv from staging Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize staging: hv: remove unneeded osd_schedule_callback staging: hv: convert channel_mgmt.c to not call osd_schedule_callback staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback staging: brcm80211: Fix WL_<type> logging macros Staging: IIO: DDS: AD9833 / AD9834 driver Staging: IIO: dds.h convenience macros Staging: IIO: Direct digital synthesis abi documentation staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr staging: brcm80211: Remove unused ether_<foo> #defines and struct staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR Staging: comedi: Fix checkpatch.pl issues in file s526.c ... Fix up trivial conflict in drivers/video/udlfb.c		2011-01-10 16:04:53 -08:00
..
Kconfig	Staging: zram: Replace ioctls with sysfs interface	2010-08-31 15:33:54 -07:00
Makefile	Staging: zram: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:41 -07:00
xvmalloc_int.h
xvmalloc.c	staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'	2010-12-08 14:31:02 -08:00
xvmalloc.h
zram_drv.c	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
zram_drv.h	Staging: zram: Remove need for explicit device initialization	2010-08-31 15:36:36 -07:00
zram_sysfs.c	Staging: zram: fix up my fixup for some sysfs attribute permissions	2010-11-18 11:27:19 -08:00
zram.txt	Staging: zram: Update zram documentation	2010-08-31 15:36:36 -07:00