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
..
2011-01-06 11:38:19 -08:00
2010-10-15 15:53:27 +02:00
2010-11-15 22:40:38 +01:00
2010-10-27 18:03:08 -07:00
2010-12-22 12:57:27 +09:00
2010-08-09 11:25:17 +02:00
2010-08-09 11:25:17 +02:00
2010-12-24 12:33:55 +09:00
2011-01-06 15:48:13 +09:00
2010-05-25 08:07:09 -07:00
2010-10-09 17:07:23 +08:00
2010-12-21 01:05:43 +09:00
2010-05-25 08:07:09 -07:00
2010-12-21 01:05:43 +09:00
2010-05-27 09:12:42 -07:00
2010-05-25 08:07:09 -07:00
2010-06-16 18:05:05 +02:00
2010-08-16 15:14:03 +02:00
2010-05-25 08:07:08 -07:00
2010-05-25 08:07:08 -07:00