summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'paul' (Fixups from Paul Gortmaker)Linus Torvalds2012-04-0210-113/+128
|\
| * asm-generic: add linux/types.h to cmpxchg.hPaul Gortmaker2012-04-021-0/+1
| * firewire: restore the device.h include in linux/firewire.hPaul Gortmaker2012-04-021-2/+1
| * frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOLPaul Gortmaker2012-04-021-0/+1
| * parisc: fix missing cmpxchg file error from system.h splitPaul Gortmaker2012-04-022-106/+117
| * blackfin: fix cmpxchg build fails from system.h falloutPaul Gortmaker2012-04-021-1/+2
| * avr32: fix build failures from mis-naming of atmel_nand.hPaul Gortmaker2012-04-022-4/+4
| * ARM: mach-msm: fix compile fail from system.h falloutPaul Gortmaker2012-04-021-0/+1
| * irq_work: fix compile failure on MIPS from system.h splitPaul Gortmaker2012-04-021-0/+1
* | Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsiLinus Torvalds2012-04-0216-0/+1932
|\ \
| * | HSI: hsi_char: Update ioctl-number.txtAndras Domokos2012-01-051-0/+1
| * | HSI: Add HSI API documentationCarlos Chinea2012-01-051-0/+17
| * | HSI: hsi_char: Add HSI char device kernel configurationAndras Domokos2012-01-056-0/+23
| * | HSI: hsi_char: Add HSI char device driverAndras Domokos2012-01-052-0/+865
| * | HSI: hsi: Introducing HSI frameworkCarlos Chinea2012-01-058-0/+1026
* | | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar...Linus Torvalds2012-04-021-1/+1
|\ \ \
| * | | Subject: [PATCH] tags.sh: Add missing quotesStephen Boyd2012-04-021-1/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-04-028-13/+103
|\ \ \
| * | | crypto: user - Fix size of netlink dump messageSteffen Klassert2012-03-292-0/+11
| * | | crypto: user - Fix lookup of algorithms with IV generatorSteffen Klassert2012-03-295-5/+79
| * | | crypto: pcrypt - Use the online cpumask as the defaultSteffen Klassert2012-03-291-4/+4
| * | | padata: Fix cpu hotplugSteffen Klassert2012-03-291-0/+3
| * | | padata: Use the online cpumask as the defaultSteffen Klassert2012-03-291-4/+4
| * | | padata: Add a reference to the api documentationSteffen Klassert2012-03-291-0/+2
* | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2012-04-0234-61/+712
|\ \ \ \
| * | | | powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current...Andrew Morton2012-04-021-1/+1
| * | | | powerpc/eeh: Remove eeh_event_handler()->daemonize()Oleg Nesterov2012-04-021-1/+1
| * | | | powerpc/kvm: Fallout from system.h disintegrationBenjamin Herrenschmidt2012-04-023-0/+3
| * | | | powerpc: Fix fallout from system.h split upStephen Rothwell2012-04-022-0/+3
| * | | | powerpc: Mark const init data with __initconst instead of __initdataUwe Kleine-König2012-04-023-3/+3
| * | | | Merge remote-tracking branch 'kumar/next' into mergeBenjamin Herrenschmidt2012-04-0225-56/+701
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | powerpc/qe: Update the SNUM table for MPC8569 Rev2.0Dave Liu2012-03-292-4/+24
| | * | | powerpc/dts: Removed fsl,msi property from dts.Diana CRACIUN2012-03-295-16/+0
| | * | | powerpc/epapr: add "memory" as a clobber to all hypercallsTimur Tabi2012-03-291-1/+6
| | * | | powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigsShaveta Leekha2012-03-294-0/+5
| | * | | powerpc/85xx: add the P1020UTM-PC DTS supportJerry Huang2012-03-293-0/+318
| | * | | powerpc/85xx: add the P1020MBG-PC DTS supportJerry Huang2012-03-293-0/+329
| | * | | powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.hTimur Tabi2012-03-297-35/+19
* | | | | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-04-0228-90/+79
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cpumask: remove old cpu_*_map.Rusty Russell2012-03-291-6/+0
| * | | | documentation: remove references to cpu_*_map.Rusty Russell2012-03-2911-26/+26
| * | | | drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.Rusty Russell2012-03-291-1/+1
| * | | | remove references to cpu_*_map in arch/Rusty Russell2012-03-2919-58/+53
* | | | | Linux 3.4-rc1v3.4-rc1Linus Torvalds2012-04-011-2/+2
* | | | | Merge branch 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/am...Linus Torvalds2012-04-013-81/+8
|\ \ \ \ \
| * | | | | virtio-pci: switch to PM ops macro to initialise PM functionsAmit Shah2012-03-311-6/+1
| * | | | | virtio-pci: S3 supportAmit Shah2012-03-311-21/+3
| * | | | | virtio-pci: drop restore_common()Amit Shah2012-03-311-16/+7
| * | | | | virtio: drop thaw PM operationAmit Shah2012-03-313-34/+1
| * | | | | virtio: balloon: Allow stats update after restore from S4Amit Shah2012-03-311-8/+0