Merge commit 'v2.6.28-rc4' into timers/rtc

Browse source

Conflicts:
	drivers/rtc/rtc-cmos.c

...

This commit is contained in:

Ingo Molnar 2008-11-10 09:10:44 +01:00

parent bb93d802ae f7160c7573

commit a5a64498c1

4896 changed files with 310416 additions and 207076 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

3

.mailmap

View file

23

CREDITS

View file

4

Documentation/00-INDEX

View file

28

Documentation/ABI/testing/sysfs-bus-umc

View file

43

Documentation/ABI/testing/sysfs-bus-usb

View file

25

Documentation/ABI/testing/sysfs-class-usb_host

View file

144

Documentation/ABI/testing/sysfs-class-uwb_rc

View file

100

Documentation/ABI/testing/sysfs-wusb_cbaf

View file

4

Documentation/DocBook/Makefile

View file

4

Documentation/DocBook/deviceiobook.tmpl

View file

10

Documentation/DocBook/kernel-api.tmpl

View file

6

Documentation/DocBook/kernel-hacking.tmpl

View file

4

Documentation/DocBook/mcabook.tmpl

View file

2

Documentation/DocBook/wanbook.tmpl

View file

2

Documentation/DocBook/z8530book.tmpl

View file

6

Documentation/MSI-HOWTO.txt

View file

2

Documentation/ManagementStyle

View file

4

Documentation/PCI/pci.txt

View file

11

Documentation/PCI/pcieaer-howto.txt

View file

1

Documentation/accounting/.gitignore vendored

View file

13

Documentation/arm/empeg/README

View file

49

Documentation/arm/empeg/ir.txt

View file

11

Documentation/arm/empeg/mkdevs

View file

1

Documentation/auxdisplay/.gitignore vendored

View file

3

Documentation/cciss.txt

View file

0

Documentation/cgroups.txt → Documentation/cgroups/cgroups.txt

View file

99

Documentation/cgroups/freezer-subsystem.txt

View file

1

Documentation/connector/.gitignore vendored

View file

24

Documentation/controllers/memory.txt

View file

2

Documentation/cpusets.txt

View file

25

Documentation/email-clients.txt

View file

8

Documentation/feature-removal-schedule.txt

View file

12

Documentation/filesystems/Locking

View file

5

Documentation/filesystems/ext3.txt

View file

28

Documentation/filesystems/proc.txt

View file

9

Documentation/filesystems/ubifs.txt

View file

32

Documentation/filesystems/vfat.txt

View file

39

Documentation/filesystems/vfs.txt

View file

3

Documentation/ftrace.txt

View file

2

Documentation/hwmon/lm90

View file

7

Documentation/i2c/busses/i2c-i801

View file

2

Documentation/i2c/busses/i2c-sis96x

View file

160

Documentation/i2c/porting-clients

View file

475

Documentation/i2c/writing-clients

View file

1

Documentation/ia64/.gitignore vendored

View file

183

Documentation/ia64/xen.txt

View file

405

Documentation/input/elantech.txt

View file

82

Documentation/io-mapping.txt

View file

2

Documentation/isdn/CREDITS

View file

14

Documentation/ja_JP/HOWTO

View file

14

Documentation/kdump/kdump.txt

View file

128

Documentation/kernel-parameters.txt

View file

28

Documentation/laptops/acer-wmi.txt

View file

2

Documentation/lguest/Makefile

View file

4

Documentation/lguest/lguest.c

View file

10

Documentation/markers.txt

View file

714

Documentation/mtd/nand_ecc.txt

View file

1

Documentation/networking/.gitignore vendored

View file

2

Documentation/networking/dmfe.txt

View file

1

Documentation/pcmcia/.gitignore vendored

View file

2

Documentation/powerpc/booting-without-of.txt

View file

4

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

View file

2

Documentation/scheduler/00-INDEX

View file

2

Documentation/scheduler/sched-design-CFS.txt

View file

2

Documentation/scsi/aacraid.txt

View file

4

Documentation/sh/new-machine.txt

View file

2

Documentation/spi/.gitignore vendored

View file

1

Documentation/stable_kernel_rules.txt

View file

24

Documentation/sysctl/kernel.txt

View file

4

Documentation/sysrq.txt

View file

101

Documentation/tracepoints.txt

View file

5

Documentation/tracers/mmiotrace.txt

View file

448

Documentation/usb/WUSB-Design-overview.txt

View file

139

Documentation/usb/wusb-cbaf

View file

1

Documentation/video4linux/.gitignore vendored

View file

2

Documentation/video4linux/bttv/CONTRIBUTORS

View file

1

Documentation/vm/.gitignore vendored

View file

615

Documentation/vm/unevictable-lru.txt

View file

2

Documentation/watchdog/src/.gitignore vendored

View file

4

Documentation/x86/x86_64/boot-options.txt

View file

2

Documentation/x86/x86_64/fake-numa-for-cpusets

View file

94

MAINTAINERS

View file

18

Makefile

View file

2

arch/Kconfig

View file

1

arch/alpha/Kconfig

View file

2

arch/alpha/include/asm/thread_info.h

View file

4

arch/alpha/kernel/core_marvel.c

View file

20

arch/alpha/kernel/osf_sys.c

View file

6

arch/alpha/kernel/sys_sable.c

View file

18

arch/alpha/kernel/time.c

View file

2

arch/alpha/oprofile/common.c

View file

18

arch/arm/Kconfig

View file

2

arch/arm/Makefile

View file

2

arch/arm/boot/compressed/Makefile

View file

2

arch/arm/common/Kconfig

View file

4

arch/arm/common/sa1111.c

View file

19

arch/arm/common/sharpsl_pm.c

View file

1438

arch/arm/configs/corgi_defconfig

View file

2

arch/arm/configs/msm_defconfig

View file

1346

arch/arm/configs/spitz_defconfig

View file

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