Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: drivers/power/wm97xx_battery.c
2026-11-13 07:31:07 +00:00 · 2009-09-23 03:49:27 +04:00 · 2009-09-23 03:49:27 +04:00 · f056878332
commit f056878332
parent 3961f7c3cf 7fa07729e4
8905 changed files with 932896 additions and 486077 deletions
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
--- a/include/linux/amba/pl093.h
+++ b/include/linux/amba/pl093.h
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/attribute_container.h
+++ b/include/linux/attribute_container.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/blk-iopoll.h
+++ b/include/linux/blk-iopoll.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/cb710.h
+++ b/include/linux/cb710.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
--- a/include/linux/decompress/generic.h
+++ b/include/linux/decompress/generic.h
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dm-log-userspace.h
+++ b/include/linux/dm-log-userspace.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
--- a/include/linux/dtlk.h
+++ b/include/linux/dtlk.h
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
--- a/include/linux/dvb/version.h
+++ b/include/linux/dvb/version.h
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fips.h
+++ b/include/linux/fips.h
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
--- a/include/linux/flex_array.h
+++ b/include/linux/flex_array.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/hayesesp.h
+++ b/include/linux/hayesesp.h
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
--- a/include/linux/hid-debug.h
+++ b/include/linux/hid-debug.h
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
--- a/include/linux/init.h
+++ b/include/linux/init.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/input/eeti_ts.h
+++ b/include/linux/input/eeti_ts.h
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
--- a/include/linux/isdn/hdlc.h
+++ b/include/linux/isdn/hdlc.h
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/include/linux/keyctl.h
+++ b/include/linux/keyctl.h
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
--- a/include/linux/kmemleak.h
+++ b/include/linux/kmemleak.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/Show more
+++ b/Show more