Jeff Garzik 28eb177dfa Merge branch 'master' into upstream ...

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

2006-09-22 20:10:23 -04:00

..

acorn

…

acpi

Merge trivial low-risk suspend hotkey bugzilla-5918 into release

2006-08-20 21:49:29 -04:00

amba

…

atm

[ATM]: [he] don't hold the device lock when upcalling

2006-09-19 12:59:11 -07:00

base

[S390] hypfs comment cleanup.

2006-09-20 15:58:44 +02:00

block

[BLOCK] cryptoloop: Use block ciphers where applicable

2006-09-21 11:45:53 +10:00

bluetooth

…

cdrom

[PATCH] cdrom/gdsc: fix printk format warning

2006-08-27 11:01:33 -07:00

char

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2006-09-22 12:48:03 -07:00

clocksource

…

connector

…

cpufreq

…

crypto

[CRYPTO] padlock: Convert padlock-sha to use crypto_hash

2006-09-21 11:46:22 +10:00

dio

…

dma

…

edac

[PATCH] drivers/edac/edac_mc.h must #include <linux/platform_device.h>

2006-08-06 08:57:46 -07:00

eisa

…

fc4

…

firmware

…

hwmon

[PATCH] hwmon: abituguru timeout fixes

2006-08-26 13:05:19 -07:00

i2c

Merge branch 'merge'

2006-08-31 15:45:48 +10:00

ide

[POWERPC] Fix ohare IDE irq workaround on old powermacs

2006-09-22 15:19:58 +10:00

ieee1394

[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc

2006-08-27 11:01:28 -07:00

infiniband

IB: Fix typo in kerneldoc for ib_set_client_data()

2006-09-22 15:22:58 -07:00

input

Input: psmouse - fix Intellimouse 4.0 initialization

2006-08-23 00:48:03 -04:00

isdn

Merge branch 'master' into upstream

2006-08-07 06:38:41 -04:00

leds

…

macintosh

Merge branch 'linux-2.6'

2006-09-14 07:07:18 +10:00

mca

…

md

[BLOCK] dm-crypt: trivial comment improvements

2006-09-21 11:46:27 +10:00

media

V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules

2006-09-10 13:46:01 -03:00

message

[SCSI] mptfc: correct out of order event processing

2006-08-06 15:48:31 -05:00

mfd

…

misc

…

mmc

[MMC] Always use a sector size of 512 bytes

2006-09-07 16:01:30 +01:00

mtd

Revert "[MTD] blkdev helper code: fix printk format warning"

2006-09-22 11:05:42 +01:00

net

Merge branch 'master' into upstream

2006-09-22 20:10:23 -04:00

nubus

…

oprofile

…

parisc

…

parport

…

pci

Merge branch 'linux-2.6'

2006-09-14 07:07:18 +10:00

pcmcia

…

pnp

[PATCH] pnpacpi: reject ACPI_PRODUCER resources

2006-08-06 08:57:49 -07:00

rapidio

…

rtc

[PATCH] rtc-s3c.c: fix time setting checks

2006-08-27 11:01:28 -07:00

s390

[S390] cio: subchannel evaluation function operates without lock

2006-09-20 16:00:01 +02:00

sbus

[OPENPROMIO]: Handle current_node being NULL correctly.

2006-09-18 01:47:13 -07:00

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2006-09-22 12:51:33 -07:00

serial

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2006-09-22 12:48:03 -07:00

sh

…

sn

…

spi

…

tc

…

telephony

…

usb

USB: Fix unload oops and memory leak in yealink driver

2006-09-12 03:10:21 -07:00

video

Merge branch 'linux-2.6'

2006-09-14 07:07:18 +10:00

w1

…

zorro

…

Kconfig

…

Makefile

…