Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
author黄涛 <huangtao@rock-chips.com>
Sat, 30 Jul 2011 08:09:59 +0000 (16:09 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sat, 30 Jul 2011 08:09:59 +0000 (16:09 +0800)
commit5f1e6e97d507ead6bb3af75d644511eff8eb5dc8
treecd842bff3c2b7d8c170e726f2c6b90ef6852de00
parent77d6545a14db425b338c866cf4688f277fc17f89
Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

This reverts commit 7cd3739f32f642e2bdd722b253abbc4318202002, reversing
changes made to 2748ae2cc2276d238e1d0d54b739fa1009fd94ad.

Conflicts:

drivers/usb/core/hub.c
drivers/usb/serial/option.c
471 files changed:
Documentation/i2c/instantiating-devices
Documentation/kernel-parameters.txt
Documentation/sound/alsa/HD-Audio-Models.txt
Documentation/usb/proc_usb_info.txt
MAINTAINERS
arch/arm/kernel/signal.c
arch/arm/kernel/sys_oabi-compat.c
arch/ia64/include/asm/system.h
arch/ia64/kernel/mca.c
arch/ia64/sn/pci/tioca_provider.c
arch/m68k/mm/motorola.c
arch/mips/alchemy/mtx-1/platform.c
arch/mips/mm/dma-default.c
arch/parisc/kernel/firmware.c
arch/parisc/kernel/irq.c
arch/parisc/mm/init.c
arch/powerpc/boot/Makefile
arch/powerpc/include/asm/hvcall.h
arch/powerpc/include/asm/kexec.h
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/reg.h
arch/powerpc/include/asm/system.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/cpu_setup_6xx.S
arch/powerpc/kernel/crash.c
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/misc_64.S
arch/powerpc/kernel/paca.c
arch/powerpc/kernel/perf_event.c
arch/powerpc/kernel/rtas_flash.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/platforms/pseries/hvCall.S
arch/powerpc/platforms/pseries/lpar.c
arch/powerpc/platforms/pseries/plpar_wrappers.h
arch/powerpc/sysdev/fsl_rio.c
arch/s390/include/asm/processor.h
arch/s390/include/asm/system.h
arch/s390/include/asm/vdso.h
arch/s390/kernel/traps.c
arch/x86/Kconfig
arch/x86/include/asm/acpi.h
arch/x86/include/asm/apicdef.h
arch/x86/include/asm/kvm_host.h
arch/x86/include/asm/mmu_context.h
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/pgtable-3level.h
arch/x86/include/asm/processor.h
arch/x86/include/asm/pvclock.h
arch/x86/include/asm/smpboot_hooks.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/mcheck/mce_amd.c
arch/x86/kernel/cpu/mcheck/therm_throt.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/e820.c
arch/x86/kernel/early-quirks.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/hpet.c
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/process.c
arch/x86/kernel/pvclock.c
arch/x86/kernel/tsc.c
arch/x86/kvm/x86.c
arch/x86/lib/semaphore_32.S
arch/x86/mm/fault.c
arch/x86/mm/pgtable.c
arch/x86/xen/mmu.c
arch/x86/xen/time.c
block/blk-sysfs.c
drivers/ata/ahci.c
drivers/ata/libata-core.c
drivers/ata/libata-scsi.c
drivers/ata/pata_mpc52xx.c
drivers/ata/sata_via.c
drivers/atm/solos-pci.c
drivers/block/cciss.h
drivers/block/pktcdvd.c
drivers/bluetooth/btusb.c
drivers/char/agp/generic.c
drivers/char/hvc_iucv.c
drivers/char/i8k.c
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm.h
drivers/char/tpm/tpm_tis.c
drivers/firmware/dcdbas.c
drivers/gpu/drm/Kconfig
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/radeon/atom.c
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-cypress.c
drivers/hid/hid-ids.h
drivers/hwmon/applesmc.c
drivers/hwmon/f71882fg.c
drivers/hwmon/sht15.c
drivers/hwmon/via686a.c
drivers/i2c/i2c-core.c
drivers/infiniband/core/cm.c
drivers/infiniband/core/cma.c
drivers/input/mouse/bcm5974.c
drivers/input/mouse/elantech.c
drivers/input/mouse/elantech.h
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.h
drivers/input/serio/i8042-x86ia64io.h
drivers/input/serio/i8042.c
drivers/input/xen-kbdfront.c
drivers/isdn/hisax/config.c
drivers/isdn/hisax/hisax.h
drivers/isdn/i4l/isdn_tty.c
drivers/md/dm-mpath.c
drivers/md/dm-raid1.c
drivers/md/dm-region-hash.c
drivers/md/dm.c
drivers/md/md.c
drivers/media/dvb/b2c2/flexcop-pci.c
drivers/media/dvb/dvb-usb/dib0700_devices.c
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
drivers/media/dvb/ttpci/av7110_ca.c
drivers/media/radio/radio-aimslab.c
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/sn9c102/sn9c102_core.c
drivers/media/video/uvc/uvc_video.c
drivers/message/fusion/mptctl.c
drivers/message/fusion/mptscsih.c
drivers/mfd/ab3100-core.c
drivers/mfd/ucb1x00-ts.c
drivers/misc/ep93xx_pwm.c
drivers/mmc/host/sdhci-pci.c
drivers/mmc/host/sdhci.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/generic.c
drivers/mtd/onenand/omap2.c
drivers/net/Makefile
drivers/net/atl1c/atl1c_main.c
drivers/net/benet/be.h
drivers/net/benet/be_main.c
drivers/net/bnx2x_main.c
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_ipv6.c
drivers/net/bonding/bond_main.c
drivers/net/cxgb3/common.h
drivers/net/cxgb3/cxgb3_main.c
drivers/net/e1000/e1000_main.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
drivers/net/ehea/ehea_ethtool.c
drivers/net/hydra.c
drivers/net/igbvf/igbvf.h
drivers/net/ipg.c
drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/myri10ge/myri10ge.c
drivers/net/ne-h8300.c
drivers/net/netx-eth.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/niu.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pppol2tp.c
drivers/net/r8169.c
drivers/net/slip.c
drivers/net/spider_net.c
drivers/net/tehuti.c
drivers/net/tokenring/tms380tr.c
drivers/net/tulip/tulip_core.c
drivers/net/virtio_net.c
drivers/net/vmxnet3/vmxnet3_ethtool.c
drivers/net/zorro8390.c
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/intel-iommu.c
drivers/pci/pci-stub.c
drivers/pci/pci-sysfs.c
drivers/pci/quirks.c
drivers/platform/x86/acer-wmi.c
drivers/platform/x86/asus_acpi.c
drivers/platform/x86/dell-laptop.c
drivers/platform/x86/tc1100-wmi.c
drivers/power/ds2760_battery.c
drivers/rtc/rtc-cmos.c
drivers/rtc/rtc-ds1511.c
drivers/s390/block/dasd_eckd.c
drivers/s390/char/keyboard.c
drivers/scsi/device_handler/scsi_dh_alua.c
drivers/scsi/device_handler/scsi_dh_emc.c
drivers/scsi/libsas/sas_scsi_host.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/mpt2sas/mpt2sas_base.c
drivers/scsi/mpt2sas/mpt2sas_ctl.c
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/scsi/pmcraid.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_sysfs.c
drivers/scsi/sd.c
drivers/scsi/ses.c
drivers/serial/8250.c
drivers/serial/imx.c
drivers/staging/comedi/drivers/jr3_pci.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/hv/Channel.c
drivers/staging/hv/Connection.c
drivers/staging/hv/Vmbus.c
drivers/staging/hv/VmbusPrivate.h
drivers/staging/hv/blkvsc_drv.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/rtl8192su/r8192S_firmware.c
drivers/staging/rtl8192su/r8192U_core.c
drivers/staging/rtl8192su/r819xU_cmdpkt.c
drivers/staging/usbip/stub_rx.c
drivers/staging/usbip/stub_tx.c
drivers/staging/usbip/usbip_common.c
drivers/staging/usbip/usbip_common.h
drivers/staging/usbip/vhci.h
drivers/staging/usbip/vhci_hcd.c
drivers/staging/usbip/vhci_rx.c
drivers/usb/class/cdc-acm.c
drivers/usb/core/devices.c
drivers/usb/core/hcd-pci.c
drivers/usb/core/hub.c
drivers/usb/core/quirks.c
drivers/usb/gadget/printer.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-pci.c
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci.h
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-pci.c
drivers/usb/host/ohci.h
drivers/usb/host/pci-quirks.c
drivers/usb/host/xhci-mem.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.h
drivers/usb/misc/iowarrior.c
drivers/usb/misc/uss720.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/omap2430.c
drivers/usb/serial/ch341.c
drivers/usb/serial/cp210x.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio_ids.h
drivers/usb/serial/generic.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/kobil_sct.c
drivers/usb/serial/option.c
drivers/usb/serial/pl2303.c
drivers/usb/serial/pl2303.h
drivers/usb/serial/sierra.c
drivers/usb/serial/spcp8x5.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/serial/visor.c
drivers/usb/storage/unusual_cypress.h
drivers/usb/storage/unusual_devs.h
drivers/video/backlight/mbp_nvidia_bl.c
drivers/video/console/tileblit.c
drivers/virtio/virtio_pci.c
fs/aio.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/ioctl.c
fs/btrfs/root-tree.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c
fs/cifs/cifsproto.h
fs/cifs/cifssmb.c
fs/cifs/connect.c
fs/cifs/file.c
fs/cifs/inode.c
fs/cifs/sess.c
fs/compat.c
fs/dcache.c
fs/ecryptfs/inode.c
fs/ecryptfs/keystore.c
fs/ecryptfs/mmap.c
fs/eventpoll.c
fs/exec.c
fs/ext2/namei.c
fs/ext3/namei.c
fs/ext3/super.c
fs/ext4/inode.c
fs/file_table.c
fs/fuse/file.c
fs/fuse/fuse_i.h
fs/gfs2/bmap.c
fs/gfs2/quota.c
fs/nfs/direct.c
fs/nfs/file.c
fs/nfs/inode.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
fs/nfs/super.c
fs/nfsd/lockd.c
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4xdr.c
fs/nfsd/vfs.c
fs/nilfs2/file.c
fs/ocfs2/aops.c
fs/ocfs2/refcounttree.c
fs/ocfs2/stack_user.c
fs/partitions/efi.c
fs/partitions/ldm.c
fs/partitions/mac.c
fs/partitions/osf.c
fs/proc/array.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/quota/dquot.c
fs/ramfs/file-nommu.c
fs/read_write.c
fs/splice.c
fs/squashfs/dir.c
fs/squashfs/namei.c
fs/ubifs/commit.c
fs/ubifs/debug.c
fs/ubifs/file.c
fs/ubifs/lpt.c
fs/ubifs/recovery.c
fs/xfs/linux-2.6/xfs_export.c
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_ioctl32.c
fs/xfs/quota/xfs_qm.c
fs/xfs/quota/xfs_qm_syscalls.c
fs/xfs/xfs_fsops.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_iget.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_itable.c
fs/xfs/xfs_itable.h
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_rtalloc.c
fs/xfs/xfs_trans_inode.c
fs/xfs/xfs_vnodeops.c
include/drm/drmP.h
include/drm/drm_pciids.h
include/keys/rxrpc-type.h
include/linux/binfmts.h
include/linux/cred.h
include/linux/ftrace.h
include/linux/hardirq.h
include/linux/ieee80211.h
include/linux/klist.h
include/linux/mmc/host.h
include/linux/netdevice.h
include/linux/pid.h
include/linux/sched.h
include/linux/usb/serial.h
include/net/af_unix.h
include/net/mac80211.h
include/net/sctp/command.h
include/scsi/scsi_device.h
include/sound/soc-dapm.h
init/Kconfig
init/calibrate.c
init/main.c
kernel/capability.c
kernel/cpuset.c
kernel/cred-internals.h [new file with mode: 0644]
kernel/cred.c
kernel/exit.c
kernel/irq/manage.c
kernel/kgdb.c
kernel/ksysfs.c
kernel/perf_event.c
kernel/pid.c
kernel/power/snapshot.c
kernel/ptrace.c
kernel/sched.c
kernel/sched_debug.c
kernel/sched_fair.c
kernel/sched_features.h
kernel/sched_rt.c
kernel/signal.c
kernel/smp.c
kernel/softirq.c
kernel/sys.c
kernel/time/clocksource.c
kernel/time/tick-broadcast.c
kernel/time/tick-common.c
kernel/time/tick-internal.h
kernel/time/timekeeping.c
kernel/trace/ftrace.c
kernel/user.c
mm/mremap.c
mm/shmem.c
net/ax25/af_ax25.c
net/bluetooth/bnep/sock.c
net/bluetooth/sco.c
net/bridge/netfilter/ebtables.c
net/can/bcm.c
net/can/raw.c
net/core/dev.c
net/core/filter.c
net/dccp/input.c
net/dccp/options.c
net/econet/af_econet.c
net/ipv4/devinet.c
net/ipv4/inet_diag.c
net/ipv4/ip_gre.c
net/ipv4/ip_output.c
net/ipv4/ipip.c
net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c
net/ipv4/netfilter/ipt_CLUSTERIP.c
net/ipv4/tcp.c
net/ipv6/addrconf.c
net/ipv6/ip6_tunnel.c
net/ipv6/netfilter/ip6_tables.c
net/ipv6/sit.c
net/irda/af_irda.c
net/irda/iriap.c
net/irda/irnet/irnet_ppp.c
net/mac80211/main.c
net/mac80211/sta_info.c
net/netfilter/nf_log.c
net/packet/af_packet.c
net/phonet/pn_dev.c
net/rds/rdma.c
net/rose/rose_subr.c
net/sched/cls_cgroup.c
net/sctp/auth.c
net/sctp/sm_make_chunk.c
net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c
net/sunrpc/cache.c
net/sunrpc/sched.c
net/sunrpc/xprtsock.c
net/tipc/socket.c
net/unix/af_unix.c
net/unix/garbage.c
net/x25/x25_link.c
scripts/kconfig/conf.c
security/selinux/hooks.c
security/selinux/nlmsgtab.c
sound/core/hrtimer.c
sound/core/init.c
sound/oss/dev_table.h
sound/oss/midi_synth.c
sound/oss/midi_synth.h
sound/oss/opl3.c
sound/oss/sequencer.c
sound/pci/au88x0/au88x0_pcm.c
sound/pci/ctxfi/ctatc.c
sound/pci/ctxfi/ctdaio.c
sound/pci/ctxfi/ctmixer.c
sound/pci/ens1370.c
sound/pci/hda/hda_eld.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/ppc/tumbler.c
sound/soc/blackfin/bf5xx-ac97.c
sound/soc/codecs/wm8990.c
sound/soc/codecs/wm_hubs.c
sound/synth/emux/emux_hwdep.c
sound/usb/caiaq/audio.c
sound/usb/caiaq/midi.c
sound/usb/usx2y/us122l.c
tools/perf/Makefile