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

..

acpi

Merge branch 'misc' into release

2010-10-26 14:51:00 -04:00

asm-generic

taskstats: use real microsecond granularity for CPU times

2010-10-27 18:03:17 -07:00

crypto

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

drm

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

2010-10-26 09:23:22 +10:00

keys

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

linux

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

mtd

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

net

caif-u5500: Adding shared memory include

2010-10-27 12:29:51 -07:00

pcmcia

pcmcia: IOCARD is also required for using IRQs

2010-10-22 08:46:36 +02:00

rdma

IB/core: Add VLAN support for IBoE

2010-10-25 10:20:39 -07:00

rxrpc

net: use __packed annotation

2010-06-03 03:21:52 -07:00

scsi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2010-10-26 17:54:22 -07:00

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-10-25 08:32:05 -07:00

trace

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

video

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-10-25 08:32:05 -07:00

xen

Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

2010-10-26 18:20:19 -07:00

Kbuild

…