Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Browse source

Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

...

This commit is contained in:

H. Peter Anvin 2013-04-20 09:16:44 -07:00

parent 15b9c359f2 a9499fa7cd

commit f53f292eea

11071 changed files with 608822 additions and 339946 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

22

CREDITS

View file

151

Documentation/00-INDEX

View file

185

Documentation/ABI/stable/sysfs-class-tpm

View file

10

Documentation/ABI/testing/ima_policy

View file

10

Documentation/ABI/testing/pstore

View file

62

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

View file

45

Documentation/ABI/testing/sysfs-bus-fcoe

View file

13

Documentation/ABI/testing/sysfs-bus-iio-mpu6050

View file

9

Documentation/ABI/testing/sysfs-bus-usb

View file

5

Documentation/ABI/testing/sysfs-class-bdi

View file

13

Documentation/ABI/testing/sysfs-devices-power_resources_D0

View file

14

Documentation/ABI/testing/sysfs-devices-power_resources_D1

View file

14

Documentation/ABI/testing/sysfs-devices-power_resources_D2

View file

14

Documentation/ABI/testing/sysfs-devices-power_resources_D3hot

View file

20

Documentation/ABI/testing/sysfs-devices-power_state

View file

23

Documentation/ABI/testing/sysfs-devices-real_power_state

View file

12

Documentation/ABI/testing/sysfs-devices-resource_in_use

View file

14

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

21

Documentation/ABI/testing/sysfs-driver-hid-srws1

View file

23

Documentation/ABI/testing/sysfs-driver-hid-thingm

View file

52

Documentation/ABI/testing/sysfs-kernel-mm-ksm

View file

83

Documentation/ABI/testing/sysfs-platform-msi-laptop

View file

47

Documentation/ABI/testing/sysfs-platform-ts5500

View file

10

Documentation/CodingStyle

View file

9

Documentation/DMA-API-HOWTO.txt

View file

4

Documentation/DocBook/80211.tmpl

View file

78

Documentation/DocBook/drm.tmpl

View file

11

Documentation/DocBook/kernel-hacking.tmpl

View file

6

Documentation/DocBook/kgdb.tmpl

View file

2

Documentation/DocBook/media/dvb/dvbapi.xml

View file

180

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

2

Documentation/DocBook/media/dvb/frontend.xml

View file

2

Documentation/DocBook/media/v4l/common.xml

View file

16

Documentation/DocBook/media/v4l/compat.xml

View file

23

Documentation/DocBook/media/v4l/controls.xml

View file

59

Documentation/DocBook/media/v4l/io.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

View file

34

Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml

View file

62

Documentation/DocBook/media/v4l/pixfmt-uv8.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt.xml

View file

938

Documentation/DocBook/media/v4l/subdev-formats.xml

View file

12

Documentation/DocBook/media/v4l/v4l2.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

View file

30

Documentation/DocBook/media/v4l/vidioc-expbuf.xml

View file

8

Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml

View file

57

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-querycap.xml

View file

1

Documentation/DocBook/media_api.tmpl

View file

2

Documentation/DocBook/uio-howto.tmpl

View file

102

Documentation/DocBook/writing-an-alsa-driver.tmpl

View file

27

Documentation/EDID/HOWTO.txt

View file

18

Documentation/IPMI.txt

View file

37

Documentation/PCI/MSI-HOWTO.txt

View file

3

Documentation/SubmittingPatches

View file

4

Documentation/acpi/enumeration.txt

View file

77

Documentation/acpi/scan_handlers.txt

View file

2

Documentation/arm64/memory.txt

View file

2

Documentation/atomic_ops.txt

View file

4

Documentation/backlight/lp855x-driver.txt

View file

58

Documentation/block/cfq-iosched.txt

View file

38

Documentation/blockdev/nbd.txt

View file

2

Documentation/cgroups/00-INDEX

View file

37

Documentation/cgroups/blkio-controller.txt

View file

3

Documentation/cgroups/memcg_test.txt

View file

4

Documentation/coccinelle.txt

View file

6

Documentation/cpu-freq/cpu-drivers.txt

View file

8

Documentation/cpu-freq/user-guide.txt

View file

77

Documentation/device-mapper/cache-policies.txt

View file

243

Documentation/device-mapper/cache.txt

View file

44

Documentation/device-mapper/dm-raid.txt

View file

24

Documentation/devicetree/bindings/arc/interrupts.txt

View file

2

Documentation/devicetree/bindings/arm/altera/socfpga-system.txt

View file

7

Documentation/devicetree/bindings/arm/arch_timer.txt

View file

6

Documentation/devicetree/bindings/arm/armadeus.txt

View file

2

Documentation/devicetree/bindings/arm/atmel-aic.txt

View file

8

Documentation/devicetree/bindings/arm/fsl.txt

View file

4

Documentation/devicetree/bindings/arm/gic.txt

View file

27

Documentation/devicetree/bindings/arm/kirkwood.txt

View file

6

Documentation/devicetree/bindings/arm/omap/omap.txt

View file

55

Documentation/devicetree/bindings/arm/psci.txt

View file

10

Documentation/devicetree/bindings/arm/sirf.txt

View file

27

Documentation/devicetree/bindings/arm/ste-nomadik.txt

View file

32

Documentation/devicetree/bindings/arm/tegra.txt

View file

8

Documentation/devicetree/bindings/arm/vt8500.txt

View file

84

Documentation/devicetree/bindings/bus/ti-gpmc.txt

View file

91

Documentation/devicetree/bindings/clock/imx31-clock.txt

View file

1

Documentation/devicetree/bindings/clock/imx5-clock.txt

View file

2

Documentation/devicetree/bindings/clock/imx6q-clock.txt

View file

2

Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt

View file

205

Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt

View file

262

Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt

View file

73

Documentation/devicetree/bindings/clock/prima2-clock.txt

View file

12

Documentation/devicetree/bindings/crypto/fsl-sec4.txt

View file

21

Documentation/devicetree/bindings/dma/arm-pl330.txt

View file

81

Documentation/devicetree/bindings/dma/dma.txt

View file

50

Documentation/devicetree/bindings/dma/snps-dma.txt

View file

22

Documentation/devicetree/bindings/drm/exynos/g2d.txt

View file

59

Documentation/devicetree/bindings/drm/tilcdc/panel.txt

View file

18

Documentation/devicetree/bindings/drm/tilcdc/slave.txt

View file

21

Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt

View file

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