Arjan van de Ven 651dab4264 Merge commit 'linus/master' into merge-linus ...

Conflicts:

	arch/x86/kvm/i8254.c

2008-10-17 09:20:26 -07:00

..

ap_bus.c

Merge commit 'linus/master' into merge-linus

2008-10-17 09:20:26 -07:00

ap_bus.h

[S390] zcrypt: Add additional card IDs to CEX2C and CEX2A

2008-07-14 10:02:14 +02:00

Makefile

…

zcrypt_api.c

Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

2008-07-14 14:48:31 -07:00

zcrypt_api.h

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_cca_key.h

[S390] zcrypt: Comments and kernel-doc cleanup

2008-04-17 07:47:06 +02:00

zcrypt_cex2a.c

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_cex2a.h

…

zcrypt_error.h

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_mono.c

[S390] zcrypt: make init/exit functions static.

2007-10-12 16:13:03 +02:00

zcrypt_pcica.c

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_pcica.h

…

zcrypt_pcicc.c

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_pcicc.h

…

zcrypt_pcixcc.c

[S390] Cleanup zcrypt printk messages.

2008-07-14 10:02:19 +02:00

zcrypt_pcixcc.h

[S390] zcrypt: remove duplicated struct CPRBX definition

2007-10-12 16:13:04 +02:00