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

…

amba

…

atm

…

base

…

block

[BLOCK] cryptoloop: Use block ciphers where applicable

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

bluetooth

…

cdrom

…

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

…

eisa

…

fc4

…

firmware

…

hwmon

…

i2c

…

ide

[POWERPC] Fix ohare IDE irq workaround on old powermacs

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

ieee1394

…

infiniband

IB: Fix typo in kerneldoc for ib_set_client_data()

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

input

…

isdn

…

leds

…

macintosh

…

mca

…

md

[BLOCK] dm-crypt: trivial comment improvements

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

media

…

message

…

mfd

…

misc

…

mmc

…

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

…

pcmcia

…

pnp

…

rapidio

…

rtc

…

s390

[S390] cio: subchannel evaluation function operates without lock

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

sbus

…

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

…

video

…

w1

…

zorro

…

Kconfig

…

Makefile

…