Merge branch 'master' into work

Browse source

...

This commit is contained in:

Greg Kroah-Hartman 2010-11-29 10:44:22 -08:00

parent 412dc7f368 7208364652

commit 8d7ee9c498

696 changed files with 12308 additions and 4104 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

19

drivers/ata/libata-scsi.c

View file

9

drivers/ata/sata_via.c

View file

34

drivers/base/power/main.c

View file

2

drivers/block/amiflop.c

View file

2

drivers/block/ataflop.c

View file

3

drivers/block/cciss.c

View file

8

drivers/block/cciss_scsi.c

View file

1

drivers/block/drbd/drbd_receiver.c

View file

1

drivers/block/drbd/drbd_worker.c

View file

55

drivers/block/xen-blkfront.c

View file

1

drivers/char/agp/frontend.c

View file

1

drivers/char/amiserial.c

View file

1

drivers/char/briq_panel.c

View file

1

drivers/char/hpet.c

View file

1

drivers/char/hw_random/core.c

View file

1

drivers/char/istallion.c

View file

1

drivers/char/serial167.c

View file

1

drivers/char/specialix.c

View file

1

drivers/char/stallion.c

View file

1

drivers/char/sx.c

View file

1

drivers/char/uv_mmtimer.c

View file

37

drivers/char/virtio_console.c

View file

160

drivers/firewire/net.c

View file

4

drivers/firewire/sbp2.c

View file

1

drivers/gpu/drm/drm_fops.c

View file

3

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/i915_drv.h

View file

77

drivers/gpu/drm/i915/i915_gem.c

View file

149

drivers/gpu/drm/i915/intel_crt.c

View file

12

drivers/gpu/drm/i915/intel_display.c

View file

11

drivers/gpu/drm/i915/intel_i2c.c

View file

9

drivers/gpu/drm/nouveau/nouveau_backlight.c

View file

2

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

43

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

77

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

3

drivers/gpu/drm/nouveau/nouveau_connector.h

View file

55

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

7

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

36

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

8

drivers/gpu/drm/nouveau/nouveau_hw.c

View file

19

drivers/gpu/drm/nouveau/nouveau_hw.h

View file

2

drivers/gpu/drm/nouveau/nouveau_i2c.c

View file

42

drivers/gpu/drm/nouveau/nouveau_irq.c

View file

49

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

2

drivers/gpu/drm/nouveau/nouveau_object.c

View file

7

drivers/gpu/drm/nouveau/nouveau_pm.c

View file

71

drivers/gpu/drm/nouveau/nouveau_ramht.c

View file

14

drivers/gpu/drm/nouveau/nouveau_sgdma.c

View file

17

drivers/gpu/drm/nouveau/nouveau_state.c

View file

2

drivers/gpu/drm/nouveau/nouveau_temp.c

View file

7

drivers/gpu/drm/nouveau/nv04_crtc.c

View file

13

drivers/gpu/drm/nouveau/nv04_dfp.c

View file

9

drivers/gpu/drm/nouveau/nv04_pm.c

View file

16

drivers/gpu/drm/nouveau/nv50_calc.c

View file

4

drivers/gpu/drm/nouveau/nv50_crtc.c

View file

35

drivers/gpu/drm/nouveau/nv50_display.c

View file

5

drivers/gpu/drm/nouveau/nv50_fifo.c

View file

52

drivers/gpu/drm/nouveau/nv50_graph.c

View file

1

drivers/gpu/drm/nouveau/nv50_instmem.c

View file

31

drivers/gpu/drm/radeon/evergreen.c

View file

2

drivers/gpu/drm/radeon/evergreen_blit_kms.c

View file

2

drivers/gpu/drm/radeon/r600.c

View file

2

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

311

drivers/gpu/drm/radeon/r600_cs.c

View file

6

drivers/gpu/drm/radeon/r600d.h

View file

4

drivers/gpu/drm/radeon/radeon.h

View file

4

drivers/gpu/drm/radeon/radeon_benchmark.c

View file

13

drivers/gpu/drm/radeon/radeon_combios.c

View file

18

drivers/gpu/drm/radeon/radeon_connectors.c

View file

2

drivers/gpu/drm/radeon/radeon_device.c

View file

354

drivers/gpu/drm/radeon/radeon_encoders.c

View file

4

drivers/gpu/drm/radeon/radeon_gart.c

View file

2

drivers/gpu/drm/radeon/radeon_gem.c

View file

8

drivers/gpu/drm/radeon/radeon_i2c.c

View file

4

drivers/gpu/drm/radeon/radeon_irq.c

View file

2

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

View file

5

drivers/gpu/drm/radeon/radeon_mode.h

View file

7

drivers/gpu/drm/radeon/radeon_object.c

View file

7

drivers/gpu/drm/radeon/radeon_object.h

View file

6

drivers/gpu/drm/radeon/radeon_ring.c

View file

4

drivers/gpu/drm/radeon/radeon_test.c

View file

2

drivers/gpu/drm/radeon/radeon_ttm.c

View file

4

drivers/gpu/drm/radeon/rv770.c

View file

11

drivers/gpu/drm/ttm/ttm_bo.c

View file

14

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file

1

drivers/hid/hidraw.c

View file

1

drivers/hid/usbhid/hiddev.c

View file

2

drivers/hwmon/i5k_amb.c

View file

10

drivers/hwmon/lis3lv02d_i2c.c

View file

1

drivers/infiniband/hw/ipath/ipath_file_ops.c

View file

4

drivers/infiniband/ulp/srp/ib_srp.c

View file

3

drivers/input/input.c

View file

1

drivers/input/serio/serio_raw.c

View file

28

drivers/input/tablet/aiptek.c

View file

50

drivers/leds/leds-lp5521.c

View file

44

drivers/leds/leds-lp5523.c

View file

1

drivers/leds/leds-ss4200.c

View file

6

drivers/md/md.c

View file

1

drivers/md/raid1.c

View file

1

drivers/media/dvb/dvb-core/dvb_ca_en50221.c

View file

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