Merge branch 'master' into for-next

Browse source

Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

...

This commit is contained in:

Jiri Kosina 2012-10-28 19:28:52 +01:00

parent f16f84937d e657e078d3

commit 3bd7bf1f0f

15538 changed files with 1560295 additions and 1241348 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

4

drivers/Kconfig

View file

8

drivers/Makefile

View file

4

drivers/acpi/Kconfig

View file

5

drivers/acpi/Makefile

View file

1

drivers/acpi/acpica/Makefile

View file

3

drivers/acpi/acpica/achware.h

View file

23

drivers/acpi/acpica/aclocal.h

View file

29

drivers/acpi/acpica/acmacros.h

View file

14

drivers/acpi/acpica/dswload.c

View file

14

drivers/acpi/acpica/dswload2.c

View file

24

drivers/acpi/acpica/evgpe.c

View file

3

drivers/acpi/acpica/evxfgpe.c

View file

15

drivers/acpi/acpica/hwgpe.c

View file

1

drivers/acpi/acpica/hwxfsleep.c

View file

2

drivers/acpi/acpica/nsdump.c

View file

20

drivers/acpi/acpica/tbinstal.c

View file

41

drivers/acpi/acpica/tbxface.c

View file

1

drivers/acpi/acpica/utosi.c

View file

354

drivers/acpi/acpica/utxface.c

View file

317

drivers/acpi/acpica/utxfinit.c

View file

76

drivers/acpi/bgrt.c

View file

8

drivers/acpi/bus.c

View file

13

drivers/acpi/button.c

View file

30

drivers/acpi/ec.c

View file

22

drivers/acpi/fan.c

View file

134

drivers/acpi/glue.c

View file

20

drivers/acpi/hed.c

View file

101

drivers/acpi/pci_root.c

View file

44

drivers/acpi/pci_slot.c

View file

55

drivers/acpi/proc.c

View file

9

drivers/acpi/processor_driver.c

View file

41

drivers/acpi/processor_idle.c

View file

30

drivers/acpi/processor_perflib.c

View file

18

drivers/acpi/sbshc.c

View file

56

drivers/acpi/scan.c

View file

18

drivers/acpi/tables.c

View file

93

drivers/acpi/thermal.c

View file

11

drivers/acpi/utils.c

View file

8

drivers/acpi/video.c

View file

8

drivers/ata/Kconfig

View file

1

drivers/ata/Makefile

View file

16

drivers/ata/ahci.h

View file

58

drivers/ata/ahci_platform.c

View file

97

drivers/ata/libahci.c

View file

101

drivers/ata/libata-core.c

View file

14

drivers/ata/libata-eh.c

View file

255

drivers/ata/libata-scsi.c

View file

2

drivers/ata/libata.h

View file

14

drivers/ata/pata_arasan_cf.c

View file

2

drivers/ata/pata_ep93xx.c

View file

2

drivers/ata/pata_pxa.c

View file

2

drivers/ata/pata_samsung_cf.c

View file

39

drivers/ata/sata_fsl.c

View file

450

drivers/ata/sata_highbank.c

View file

8

drivers/ata/sata_mv.c

View file

2

drivers/atm/eni.c

View file

2

drivers/base/Kconfig

View file

105

drivers/base/core.c

View file

42

drivers/base/devres.c

View file

4

drivers/base/devtmpfs.c

View file

3

drivers/base/dma-buf.c

View file

5

drivers/base/dma-coherent.c

View file

23

drivers/base/dma-contiguous.c

View file

956

drivers/base/firmware_class.c

View file

40

drivers/base/memory.c

View file

43

drivers/base/platform.c

View file

249

drivers/base/power/domain.c

View file

88

drivers/base/power/main.c

View file

47

drivers/base/power/opp.c

View file

36

drivers/base/power/power.h

View file

3

drivers/base/power/runtime.c

View file

46

drivers/base/power/wakeup.c

View file

2

drivers/base/regmap/Kconfig

View file

4

drivers/bcma/Kconfig

View file

2

drivers/bcma/bcma_private.h

View file

2

drivers/bcma/core.c

View file

28

drivers/bcma/driver_chipcommon_nflash.c

View file

9

drivers/bcma/driver_chipcommon_pmu.c

View file

123

drivers/bcma/driver_chipcommon_sflash.c

View file

6

drivers/bcma/driver_pci.c

View file

8

drivers/bcma/driver_pci_host.c

View file

12

drivers/bcma/host_pci.c

View file

2

drivers/bcma/host_soc.c

View file

32

drivers/bcma/main.c

View file

2

drivers/bcma/sprom.c

View file

12

drivers/block/Kconfig

View file

1

drivers/block/Makefile

View file

95

drivers/block/aoe/aoe.h

View file

91

drivers/block/aoe/aoeblk.c

View file

13

drivers/block/aoe/aoechr.c

View file

1236

drivers/block/aoe/aoecmd.c

View file

267

drivers/block/aoe/aoedev.c

View file

10

drivers/block/aoe/aoemain.c

View file

61

drivers/block/aoe/aoenet.c

View file

13

drivers/block/drbd/drbd_main.c

View file

5

drivers/block/floppy.c

View file

4

drivers/block/loop.c

View file

23

drivers/block/nbd.c

View file

2

drivers/block/nvme.c

View file

3

drivers/block/osdblk.c

View file

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