Linus Torvalds
b9d8be7828
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits)
[SPARC64]: Update defconfig.
[SPARC64]: Make auxio a real driver.
[PARPORT] sunbpp: Convert to new SBUS device framework.
[Documentation]: Update probing info in sbus_drivers.txt
[SCSI] qlogicpti: Convert to new SBUS device framework.
[SCSI] esp: Fix bug in esp_remove_common.
[NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
[NET] myri_sbus: Kill unused next_module struct member.
[NET] myri_sbus: Convert to new SBUS device layer.
[NET] sunqe: Convert to new SBUS driver layer.
[NET] sunbmac: Convert over to new SBUS device framework.
[NET] sunlance: Convert to new SBUS driver framework.
[NET] sunhme: Convert to new SBUS driver framework.
[NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.
[SCSI] sparc: Port esp to new SBUS driver layer.
[SOUND] sparc: Port amd7930 to new SBUS device layer.
[SBUS]: Rewrite and plug into of_device framework.
[SPARC]: Port of_device layer and make ebus use it.
[SPARC]: Port sparc64 in-kernel device tree code to sparc32.
[SPARC64]: Add of_device layer and make ebus/isa use it.
...
2006-06-24 14:48:24 -07:00
..
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2006-06-23 07:52:36 -07:00
asm-alpha
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-arm
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-arm26
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-cris
Remove unneeded _syscallX macros from user view in asm-*/unistd.h
2006-04-29 01:51:47 +01:00
asm-frv
[PATCH] frv: clean frv unistd.h
2006-06-23 07:42:55 -07:00
asm-generic
Add some basic resume trace facilities
2006-06-24 14:44:01 -07:00
asm-h8300
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-i386
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2006-06-23 07:52:36 -07:00
asm-ia64
Auto-update from upstream
2006-06-23 13:46:23 -07:00
asm-m32r
[PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use
2006-06-22 15:05:58 -07:00
asm-m68k
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-m68knommu
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-mips
[PATCH] Au1550/1200: add missing PSC #define's, make OSS driver use the proper ones
2006-06-23 07:42:56 -07:00
asm-parisc
[PATCH] Delete unused definitions of kvaddr_to_nid
2006-06-23 07:42:52 -07:00
asm-powerpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
2006-06-22 22:11:30 -07:00
asm-ppc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
2006-06-22 22:11:30 -07:00
asm-s390
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-sh
Remove unneeded _syscallX macros from user view in asm-*/unistd.h
2006-04-29 01:51:47 +01:00
asm-sh64
Remove unneeded _syscallX macros from user view in asm-*/unistd.h
2006-04-29 01:51:47 +01:00
asm-sparc
[SBUS]: Rewrite and plug into of_device framework.
2006-06-23 23:15:50 -07:00
asm-sparc64
[SBUS]: Rewrite and plug into of_device framework.
2006-06-23 23:15:50 -07:00
asm-um
Merge git://git.infradead.org/hdrcleanup-2.6
2006-06-20 15:10:08 -07:00
asm-v850
[PATCH] adjust handle_IRR_event() return type
2006-06-23 07:43:08 -07:00
asm-x86_64
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2006-06-23 07:52:36 -07:00
asm-xtensa
[PATCH] xtensa: remove verify_area macros
2006-06-23 07:43:02 -07:00
keys
[PATCH] Keys: Remove key duplication
2006-01-06 08:33:29 -08:00
linux
Add some basic resume trace facilities
2006-06-24 14:44:01 -07:00
math-emu
media
Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
2006-05-06 19:47:57 +01:00
mtd
Merge git://git.infradead.org/hdrcleanup-2.6
2006-06-20 15:10:08 -07:00
net
[NET]: fix net-core kernel-doc
2006-06-23 02:07:42 -07:00
pcmcia
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
rdma
IB/uverbs: Don't serialize with ib_uverbs_idr_mutex
2006-06-17 20:44:49 -07:00
rxrpc
[PATCH] gfp flags annotations - part 1
2005-10-08 15:00:57 -07:00
scsi
Merge branch 'master' into upstream
2006-06-22 22:11:56 -04:00
sound
[ALSA] version 1.0.12rc1
2006-06-22 21:35:11 +02:00
video
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00