Commits · d344aa81655f3839cfb7aab64cdb4de4c460bb0a · linux / linux-davinci

15 Sep, 2009 38 commits
- Merge commit 'jc_docs/docs-next' · d344aa81
  Stephen Rothwell authored Sep 15, 2009
  
  d344aa81
- Merge commit 'osd/linux-next' · 8690a2a5
  Stephen Rothwell authored Sep 15, 2009
  
  8690a2a5
- Merge commit 'cputime/cputime' · d5f0f0f5
  Stephen Rothwell authored Sep 15, 2009
  
  d5f0f0f5
- Merge commit 'dwmw2-iommu/master' · 77afa904
  Stephen Rothwell authored Sep 15, 2009
  
  77afa904
- Merge commit 'watchdog/master' · ae735d7c
  Stephen Rothwell authored Sep 15, 2009
  
  ae735d7c
- Merge commit 'uwb/for-upstream' · 7c8a5ed7
  Stephen Rothwell authored Sep 15, 2009
  
  7c8a5ed7
- Merge commit 'agp/agp-next' · da2e3ac8
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/char/agp/uninorth-agp.c
```
  da2e3ac8
- Merge commit 'voltage/for-next' · 55a71bc2
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/regulator/Kconfig
```
  55a71bc2
- Merge commit 'drm/drm-next' · 54b59c6a
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	firmware/Makefile
```
  54b59c6a
- Merge commit 'mfd/for-next' · a0469a32
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/input/misc/Kconfig
```
  a0469a32
- Merge commit 'slab/for-next' · b0a3054f
  Stephen Rothwell authored Sep 15, 2009
  
  b0a3054f
- Merge commit 'kgdb/kgdb-next' · 5d00b860
  Stephen Rothwell authored Sep 15, 2009
  
  5d00b860
- Merge commit 'backlight/for-mm' · 2acf90bd
  Stephen Rothwell authored Sep 15, 2009
  
  2acf90bd
- Merge commit 'leds/for-mm' · 84566b22
  Stephen Rothwell authored Sep 15, 2009
  
  84566b22
- Merge commit 'battery/master' · 7d9d9b34
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/power/wm97xx_battery.c
```
  7d9d9b34
- Merge commit 'block/for-next' · 40e07231
  Stephen Rothwell authored Sep 15, 2009
  
  40e07231
- Merge commit 'refs/next/20090908/rr' · 40c2ac2d
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/net/virtio_net.c
```
  40c2ac2d
- Merge commit 'cpufreq/next' · a0b6ca69
  Stephen Rothwell authored Sep 15, 2009
  
  a0b6ca69
- Merge commit 'sound/for-next' · 85c004ca
  Stephen Rothwell authored Sep 15, 2009
  
  85c004ca
- Merge commit 'mtd/master' · e08e56c8
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/mtd/mtdcore.c
```
  e08e56c8
- Merge commit 'wireless/master' · cd2423f2
  Stephen Rothwell authored Sep 15, 2009
  
  cd2423f2
- Merge commit 'async_tx/next' · 48e4e0f2
  Stephen Rothwell authored Sep 15, 2009
  
  48e4e0f2
- Merge commit 'scsi/master' · c8359d28
  Stephen Rothwell authored Sep 15, 2009
  
  c8359d28
- Merge commit 'dlm/next' · 1f7f3342
  Stephen Rothwell authored Sep 15, 2009
  
  1f7f3342
- Merge commit 'kvm/linux-next' · 6ffc2a69
  Stephen Rothwell authored Sep 15, 2009
  
  6ffc2a69
- Merge commit 'ubi/linux-next' · c075748d
  Stephen Rothwell authored Sep 15, 2009
  
  c075748d
- Merge commit 'ieee1394/for-next' · 7e27f259
  Stephen Rothwell authored Sep 15, 2009
  
  7e27f259
- Merge commit 'acpi/test' · 032d26c7
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/acpi/power.c
```
  032d26c7
- Merge commit 'infiniband/for-next' · 923fd00e
  Stephen Rothwell authored Sep 15, 2009
  
  923fd00e
- Merge commit 'ide/master' · a56250b9
  Stephen Rothwell authored Sep 15, 2009
  
  a56250b9
- Merge commit 'kconfig/for-next' · 6f9224c6
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	scripts/extract-ikconfig
```
  6f9224c6
- Merge commit 'kbuild/master' · fc8fa4c9
  Stephen Rothwell authored Sep 15, 2009
  
  fc8fa4c9
- Merge commit 'v4l-dvb/master' · 68c4c290
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	drivers/media/video/sh_mobile_ceu_camera.c
```
  68c4c290
- Merge branch 'quilt/kernel-doc' · e3213918
  Stephen Rothwell authored Sep 15, 2009
  
  e3213918
- Merge branch 'quilt/jdelvare-hwmon' · 150b6918
  Stephen Rothwell authored Sep 15, 2009
  
  150b6918
- Merge branch 'quilt/i2c' · 7668a5ab
  Stephen Rothwell authored Sep 15, 2009
  
  7668a5ab
- Merge commit 'hid/for-next' · 00f3b632
  Stephen Rothwell authored Sep 15, 2009
  
  00f3b632
- Merge commit 'pci/linux-next' · 88d7dda6
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	arch/powerpc/kernel/pci_64.c
```
  88d7dda6
14 Sep, 2009 2 commits
- Merge commit 'reiserfs-bkl/reiserfs/kill-bkl' · df0e19f1
  Stephen Rothwell authored Sep 15, 2009
  
  df0e19f1
- Merge commit 'xfs/master' · 3ba1a10c
  Stephen Rothwell authored Sep 15, 2009
```
Conflicts:
	fs/xfs/linux-2.6/xfs_lrw.c
```
  3ba1a10c