J. Bruce Fields b1df763723 Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10 ...

Note conflict: Chuck's patches modified (and made static)
gss_mech_get_by_OID, which is still needed by gss-proxy patches.

The conflict resolution is a bit minimal; we may want some more cleanup.

2013-04-29 16:23:34 -04:00

..

acpi

Merge tag 'stable/for-linus-3.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2013-03-12 20:25:53 -07:00

asm-generic

asm-generic: move cmpxchg*_local defs to cmpxchg.h

2013-03-13 06:11:05 +01:00

clocksource

Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

2013-03-03 12:06:09 -08:00

crypto

crypto: cast5/cast6 - move lookup tables to shared module

2012-12-06 17:16:26 +08:00

drm

drm: Documentation typo fixes

2013-03-08 08:32:23 +10:00

keys

…

linux

Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10

2013-04-29 16:23:34 -04:00

math-emu

…

media

[media] media: ov7670: Add possibility to disable pixclk during hblank

2013-02-08 14:35:06 -02:00

memory

…

misc

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-03-05 18:42:29 -08:00

pcmcia

…

ras

edac: add support for error type "Info"

2013-02-21 14:16:27 -03:00

rdma

IB/core: Add "type 2" memory windows support

2013-02-21 11:51:45 -08:00

rxrpc

…

scsi

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-03-02 11:42:16 -08:00

sound

Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-28 20:00:40 -08:00

target

target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors

2013-02-23 12:46:14 -08:00

trace

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2013-03-02 19:33:21 -08:00

uapi

Merge branch 'akpm' (fixes from Andrew)

2013-03-13 15:21:57 -07:00

video

Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers

2013-03-03 14:24:59 -08:00

xen

xen: event channel arrays are xen_ulong_t and not unsigned long

2013-02-20 08:45:07 -05:00

Kbuild

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00