Merge branch 'slab/rcu' into slab/next

Browse source

Conflicts:
	mm/slub.c

...

This commit is contained in:

Pekka Enberg 2011-03-11 18:10:45 +02:00

parent d71f606f68 5bfe53a77e

commit c914955675

1523 changed files with 28337 additions and 20577 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

.gitignore vendored

View file

1

.mailmap

View file

25

Documentation/ABI/testing/sysfs-platform-at91

View file

4

Documentation/DocBook/device-drivers.tmpl

View file

6

Documentation/DocBook/drm.tmpl

View file

5

Documentation/DocBook/filesystems.tmpl

View file

0

Documentation/powerpc/dts-bindings/fsl/sata.txt → Documentation/devicetree/bindings/ata/fsl-sata.txt

View file

0

Documentation/powerpc/dts-bindings/eeprom.txt → Documentation/devicetree/bindings/eeprom.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt → Documentation/devicetree/bindings/gpio/8xxx_gpio.txt

View file

0

Documentation/powerpc/dts-bindings/gpio/gpio.txt → Documentation/devicetree/bindings/gpio/gpio.txt

View file

0

Documentation/powerpc/dts-bindings/gpio/led.txt → Documentation/devicetree/bindings/gpio/led.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/i2c.txt → Documentation/devicetree/bindings/i2c/fsl-i2c.txt

View file

0

Documentation/powerpc/dts-bindings/marvell.txt → Documentation/devicetree/bindings/marvell.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/esdhc.txt → Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

View file

0

Documentation/powerpc/dts-bindings/mmc-spi-slot.txt → Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/upm-nand.txt → Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt

View file

0

Documentation/powerpc/dts-bindings/mtd-physmap.txt → Documentation/devicetree/bindings/mtd/mtd-physmap.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/can.txt → Documentation/devicetree/bindings/net/can/mpc5xxx-mscan.txt

View file

0

Documentation/powerpc/dts-bindings/can/sja1000.txt → Documentation/devicetree/bindings/net/can/sja1000.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/tsec.txt → Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

View file

0

Documentation/powerpc/dts-bindings/gpio/mdio.txt → Documentation/devicetree/bindings/net/mdio-gpio.txt

View file

0

Documentation/powerpc/dts-bindings/phy.txt → Documentation/devicetree/bindings/net/phy.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt → Documentation/devicetree/bindings/pci/83xx-512x-pci.txt

View file

0

Documentation/powerpc/dts-bindings/4xx/cpm.txt → Documentation/devicetree/bindings/powerpc/4xx/cpm.txt

View file

0

Documentation/powerpc/dts-bindings/4xx/emac.txt → Documentation/devicetree/bindings/powerpc/4xx/emac.txt

View file

0

Documentation/powerpc/dts-bindings/4xx/ndfc.txt → Documentation/devicetree/bindings/powerpc/4xx/ndfc.txt

View file

0

Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt → Documentation/devicetree/bindings/powerpc/4xx/ppc440spe-adma.txt

View file

0

Documentation/powerpc/dts-bindings/4xx/reboot.txt → Documentation/devicetree/bindings/powerpc/4xx/reboot.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/board.txt → Documentation/devicetree/bindings/powerpc/fsl/board.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/brg.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/brg.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/pic.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/pic.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/usb.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/usb.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/gpio.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/network.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/firmware.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/par_io.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/par_io.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/pincfg.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/pincfg.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/ucc.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/ucc.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/usb.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt → Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/serial.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/diu.txt → Documentation/devicetree/bindings/powerpc/fsl/diu.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/dma.txt → Documentation/devicetree/bindings/powerpc/fsl/dma.txt

View file

0

Documentation/powerpc/dts-bindings/ecm.txt → Documentation/devicetree/bindings/powerpc/fsl/ecm.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/gtm.txt → Documentation/devicetree/bindings/powerpc/fsl/gtm.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/guts.txt → Documentation/devicetree/bindings/powerpc/fsl/guts.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/lbc.txt → Documentation/devicetree/bindings/powerpc/fsl/lbc.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/mcm.txt → Documentation/devicetree/bindings/powerpc/fsl/mcm.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt → Documentation/devicetree/bindings/powerpc/fsl/mcu-mpc8349emitx.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/mpc5121-psc.txt → Documentation/devicetree/bindings/powerpc/fsl/mpc5121-psc.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/mpc5200.txt → Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/mpic.txt → Documentation/devicetree/bindings/powerpc/fsl/mpic.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/msi-pic.txt → Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/pmc.txt → Documentation/devicetree/bindings/powerpc/fsl/pmc.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/sec.txt → Documentation/devicetree/bindings/powerpc/fsl/sec.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/ssi.txt → Documentation/devicetree/bindings/powerpc/fsl/ssi.txt

View file

0

Documentation/powerpc/dts-bindings/nintendo/gamecube.txt → Documentation/devicetree/bindings/powerpc/nintendo/gamecube.txt

View file

0

Documentation/powerpc/dts-bindings/nintendo/wii.txt → Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/spi.txt → Documentation/devicetree/bindings/spi/fsl-spi.txt

View file

0

Documentation/powerpc/dts-bindings/spi-bus.txt → Documentation/devicetree/bindings/spi/spi-bus.txt

View file

0

Documentation/powerpc/dts-bindings/fsl/usb.txt → Documentation/devicetree/bindings/usb/fsl-usb.txt

View file

0

Documentation/powerpc/dts-bindings/usb-ehci.txt → Documentation/devicetree/bindings/usb/usb-ehci.txt

View file

0

Documentation/powerpc/dts-bindings/xilinx.txt → Documentation/devicetree/bindings/xilinx.txt

View file

165

Documentation/powerpc/booting-without-of.txt → Documentation/devicetree/booting-without-of.txt

View file

16

Documentation/feature-removal-schedule.txt

View file

2

Documentation/filesystems/ntfs.txt

View file

21

Documentation/hwmon/jc42

View file

8

Documentation/hwmon/k10temp

View file

28

Documentation/kernel-parameters.txt

View file

6

Documentation/networking/00-INDEX

View file

2

Documentation/networking/Makefile

View file

83

Documentation/networking/bonding.txt

View file

9

Documentation/networking/dns_resolver.txt

View file

2

Documentation/networking/ip-sysctl.txt

View file

33

Documentation/scheduler/sched-stats.txt

View file

1

Documentation/sound/alsa/HD-Audio-Models.txt

View file

4

Documentation/workqueue.txt

View file

109

MAINTAINERS

View file

2

Makefile

View file

1

arch/alpha/Kconfig

View file

13

arch/alpha/kernel/irq.c

View file

11

arch/alpha/kernel/irq_alpha.c

View file

18

arch/alpha/kernel/irq_i8259.c

View file

8

arch/alpha/kernel/irq_impl.h

View file

20

arch/alpha/kernel/irq_pyxis.c

View file

16

arch/alpha/kernel/irq_srm.c

View file

28

arch/alpha/kernel/sys_alcor.c

View file

16

arch/alpha/kernel/sys_cabriolet.c

View file

52

arch/alpha/kernel/sys_dp264.c

View file

18

arch/alpha/kernel/sys_eb64p.c

View file

14

arch/alpha/kernel/sys_eiger.c

View file

24

arch/alpha/kernel/sys_jensen.c

View file

42

arch/alpha/kernel/sys_marvel.c

View file

16

arch/alpha/kernel/sys_mikasa.c

View file

16

arch/alpha/kernel/sys_noritake.c

View file

17

arch/alpha/kernel/sys_rawhide.c

View file

16

arch/alpha/kernel/sys_rx164.c

View file

20

arch/alpha/kernel/sys_sable.c

View file

Some files were not shown because too many files have changed in this diff Show more