Linus Torvalds 0a01707b28 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ...

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (43 commits)
  [wireless] zd1211rw: workqueue-related build fixes
  [netdrvr] netxen: workqueue-related build fixes
  [PATCH] sky2: sparse warnings
  [PATCH] skge: fix sparse warnings
  [PATCH] myri10ge: write as 2 32-byte blocks in myri10ge_submit_8rx
  [PATCH] sky2: receive queue watermark tweak
  [PATCH] sky2: beter ram buffer partitioning
  [PATCH] sky2: add comments to PCI ids
  [PATCH] sky2: add PCI for 88ec033
  [PATCH] AT91RM9200 Ethernet: Use dev_alloc_skb()
  [PATCH] AT91RM9200 Ethernet: Add netpoll / netconsole support
  [PATCH] AT91RM9200 Ethernet: Move check_timer variable and use mod_timer()
  [PATCH] AT91RM9200 Ethernet: Remove 'at91_dev' and use netdev_priv()
  [PATCH] ipw2200: Fix debug output endian issue
  [PATCH] ipw2200: Fix a typo
  [PATCH] ipw2200: Update version stamp to 1.2.0
  [PATCH] ipw2200: Add IEEE80211_RADIOTAP_TSFT for promiscuous mode
  [PATCH] softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
  [PATCH] softmac: Fixed handling of deassociation from AP
  [PATCH] ipw2200: replace kmalloc+memset with kcalloc
  ...

2006-12-07 09:09:52 -08:00

..

acorn

…

acpi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

amba

…

ata

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

atm

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

2006-12-07 09:05:15 -08:00

base

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

2006-12-07 08:59:11 -08:00

block

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

2006-12-07 09:05:15 -08:00

bluetooth

[PATCH] lockdep: annotate bcsp driver

2006-12-07 08:39:34 -08:00

cdrom

[PATCH] drivers/cdrom/*: trivial vsnprintf() conversion

2006-12-07 08:39:35 -08:00

char

[PATCH] IPMI: fix PROC_FS=n warnings

2006-12-07 08:39:48 -08:00

clocksource

…

connector

…

cpufreq

[PATCH] hotplug CPU: clean up hotcpu_notifier() use

2006-12-07 08:39:39 -08:00

crypto

[CRYPTO] geode: Make needlessly global geode_aes_crypt() static

2006-12-06 18:38:53 -08:00

dio

…

dma

[PATCH] slab: remove SLAB_KERNEL

2006-12-07 08:39:24 -08:00

edac

[PATCH] Add include/linux/freezer.h and move definitions from sched.h

2006-12-07 08:39:27 -08:00

eisa

…

fc4

…

firmware

…

hwmon

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

i2c

[PATCH] ... and more work_struct-induced breakage (mips)

2006-12-06 14:51:14 -08:00

ide

[PATCH] winbond IDE depends on IDEDMA

2006-12-07 08:39:43 -08:00

ieee1394

[PATCH] Add include/linux/freezer.h and move definitions from sched.h

2006-12-07 08:39:27 -08:00

infiniband

[PATCH] slab: remove SLAB_KERNEL

2006-12-07 08:39:24 -08:00

input

[PATCH] Correct misc_register return code handling in several drivers

2006-12-07 08:39:35 -08:00

isdn

[PATCH] make 1-bit bitfields unsigned

2006-12-07 08:39:38 -08:00

leds

[PATCH] PCEngines WRAP LED Support

2006-12-07 08:39:36 -08:00

macintosh

[PATCH] Correct misc_register return code handling in several drivers

2006-12-07 08:39:35 -08:00

mca

…

md

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

2006-12-07 09:05:15 -08:00

media

[PATCH] make 1-bit bitfields unsigned

2006-12-07 08:39:38 -08:00

message

[PATCH] kernel-doc: fix fusion and i2o docs

2006-12-07 08:39:40 -08:00

mfd

[PATCH] Add include/linux/freezer.h and move definitions from sched.h

2006-12-07 08:39:27 -08:00

misc

[PATCH] tifm: fix NULL ptr and style

2006-12-07 08:39:33 -08:00

mmc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

mtd

[PATCH] slab: remove SLAB_KERNEL

2006-12-07 08:39:24 -08:00

net

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2006-12-07 09:09:52 -08:00

nubus

…

oprofile

…

parisc

Fix misc .c/.h comment typos

2006-11-30 05:24:39 +01:00

parport

[PATCH] parport: section mismatches with HOTPLUG=n

2006-12-07 08:39:40 -08:00

pci

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

pcmcia

[PATCH] Add include/linux/freezer.h and move definitions from sched.h

2006-12-07 08:39:27 -08:00

pnp

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

2006-12-07 08:59:11 -08:00

ps3

[POWERPC] ps3: multiplatform build fixes

2006-12-04 20:41:16 +11:00

rapidio

…

rtc

[PATCH] rtc: ds1743 support

2006-12-07 08:39:43 -08:00

s390

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

sbus

…

scsi

[PATCH] ide_scsi: allow it to be used for non CD only

2006-12-07 08:39:43 -08:00

serial

[PATCH] amba-pl010: clear error flags on rx error

2006-12-07 08:39:44 -08:00

sh

…

sn

…

spi

[PATCH] spi: check platform_device_register_simple() error

2006-12-07 08:39:42 -08:00

tc

…

telephony

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

usb

[PATCH] Add include/linux/freezer.h and move definitions from sched.h

2006-12-07 08:39:27 -08:00

video

[PATCH] Trivial cleanup in the PCI IDs for the CS5535

2006-12-07 08:39:44 -08:00

w1

[PATCH] better CONFIG_W1_SLAVE_DS2433_CRC handling

2006-12-07 08:39:43 -08:00

zorro

…

Kconfig

…

Makefile

[POWERPC] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3

2006-12-04 20:41:14 +11:00