Greg Kroah-Hartman 491acf0032 Staging: Merge 2.6.37-rc2 into staging-next ...

This was necessary in order  to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
	drivers/staging/bcm/Bcmchar.c
	drivers/staging/intel_sst/intel_sst_app_interface.c

All should be resolved now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-11-16 10:44:50 -08:00

..

Adapter.h

Staging: beceem: Use 32-bit integers for hardware register values

2010-11-10 16:28:30 -08:00

Bcmchar.c

Staging: Merge 2.6.37-rc2 into staging-next

2010-11-16 10:44:50 -08:00

Bcmnet.c

beceem: change startup messages

2010-11-01 14:06:24 -04:00

CmHost.c

Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values

2010-11-10 16:28:31 -08:00

CmHost.h

beceem: make local functions static

2010-11-01 12:37:05 -04:00

cntrl_SignalingInterface.h

beceem: eliminate dead code

2010-10-29 20:44:57 -07:00

DDRInit.c

Staging: beceem: Use 32-bit integers for hardware register values

2010-11-10 16:28:30 -08:00

DDRInit.h

…

Debug.h

beceem: use kernel print_hex_dump function

2010-11-01 09:30:59 -04:00

HandleControlPacket.c

beceem: dump control packet information

2010-11-01 14:10:41 -04:00

headers.h

beceem: fix character device ioctl

2010-11-01 09:55:08 -04:00

hostmibs.c

beceem: statistics and transmit queue changes

2010-11-01 13:53:30 -04:00

HostMIBSInterface.h

…

InterfaceAdapter.h

…

InterfaceDld.c

Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values

2010-11-10 16:28:31 -08:00

InterfaceIdleMode.c

beceem: make local functions static

2010-11-01 12:37:05 -04:00

InterfaceIdleMode.h

beceem: make local functions static

2010-11-01 12:37:05 -04:00

InterfaceInit.c

Staging: beceem: Move ZTE TU25's USB id to the beceem module

2010-11-10 16:28:30 -08:00

InterfaceInit.h

Staging: beceem: Move ZTE TU25's USB id to the beceem module

2010-11-10 16:28:30 -08:00

InterfaceIsr.c

beceem: make local functions static

2010-11-01 12:37:05 -04:00

InterfaceIsr.h

…

InterfaceMacros.h

…

InterfaceMisc.c

beceem: module initialization

2010-11-01 12:14:01 -04:00

InterfaceMisc.h

beceem: remove indirection to Adapter structure

2010-11-01 09:52:14 -04:00

InterfaceRx.c

beceem: statistics and transmit queue changes

2010-11-01 13:53:30 -04:00

InterfaceRx.h

…

InterfaceTx.c

beceem: debug message format changes

2010-11-01 12:18:36 -04:00

InterfaceTx.h

beceem: remove dead code

2010-11-01 09:50:16 -04:00

Ioctl.h

staging/bcm: add sparse annotations

2010-10-05 08:50:15 -07:00

IPv6Protocol.c

beceem: make local functions static

2010-11-01 12:37:05 -04:00

IPv6ProtocolHdr.h

beceem: make local functions static

2010-11-01 12:37:05 -04:00

Kconfig

…

LeakyBucket.c

beceem: eliminate unused bcm_jiffies

2010-11-01 13:57:35 -04:00

led_control.c

beceem: statistics and transmit queue changes

2010-11-01 13:53:30 -04:00

led_control.h

…

Macros.h

beceem: off by one on queue index

2010-11-01 12:37:48 -04:00

Makefile

beceem: remove ARP spoofing

2010-11-01 09:53:58 -04:00

Misc.c

Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values

2010-11-10 16:28:31 -08:00

nvm.c

beceem: change startup messages

2010-11-01 14:06:24 -04:00

nvm.h

beceem: eliminate dead code

2010-10-29 20:44:57 -07:00

PHSDefines.h

staging/bcm: fix most build warnings

2010-10-05 08:50:15 -07:00

PHSModule.c

beceem: make local functions static

2010-11-01 12:37:05 -04:00

PHSModule.h

beceem: make local functions static

2010-11-01 12:37:05 -04:00

Protocol.h

beceem: fix definition of VLAN header type

2010-11-01 13:54:21 -04:00

Prototypes.h

beceem: change startup messages

2010-11-01 14:06:24 -04:00

Qos.c

beceem: eliminate unused bcm_jiffies

2010-11-01 13:57:35 -04:00

Queue.h

…

sort.c

…

target_params.h

…

TODO

beceem: update TODO list

2010-11-01 14:18:16 -04:00

Transmit.c

beceem: dump control packet information

2010-11-01 14:10:41 -04:00

Typedefs.h

…

vendorspecificextn.c

…

vendorspecificextn.h

…

Version.h

…