Linux: 3.0.67

Conflict:
	Makefile

	modified:   Makefile
	modified:   arch/arm/mach-pxa/include/mach/smemc.h
	modified:   arch/arm/mach-pxa/smemc.c
	modified:   arch/parisc/include/asm/pgtable.h
	modified:   arch/parisc/kernel/cache.c
	modified:   arch/powerpc/kernel/machine_kexec_64.c
	modified:   arch/s390/kvm/kvm-s390.c
	modified:   arch/x86/include/asm/mmzone_32.h
	modified:   arch/x86/power/hibernate_32.c
	modified:   arch/x86/xen/spinlock.c
	new file:   conflictingfile
	modified:   drivers/base/bus.c
	modified:   drivers/block/sunvdc.c
	modified:   drivers/dca/dca-core.c
	modified:   drivers/gpu/drm/drm_usb.c
	modified:   drivers/gpu/drm/i915/intel_display.c
	modified:   drivers/net/wireless/p54/p54usb.c
	modified:   drivers/net/xen-netback/interface.c
	modified:   drivers/net/xen-netback/netback.c
	modified:   drivers/pcmcia/vrc4171_card.c
	modified:   drivers/s390/kvm/kvm_virtio.c
	modified:   drivers/staging/comedi/comedi_fops.c
	modified:   drivers/staging/hv/hv_kvp.c
	modified:   drivers/staging/vt6656/usbpipe.c
	modified:   drivers/tty/tty_ioctl.c
	modified:   drivers/tty/vt/vt.c
	modified:   drivers/usb/host/ehci-omap.c
	modified:   drivers/usb/serial/option.c
	modified:   drivers/usb/storage/initializers.c
	modified:   drivers/usb/storage/unusual_cypress.h
	modified:   drivers/video/backlight/adp8860_bl.c
	modified:   drivers/video/backlight/adp8870_bl.c
	modified:   drivers/video/console/fbcon.c
	modified:   drivers/video/fbmem.c
	modified:   drivers/video/fbsysfs.c
	modified:   fs/ext4/resize.c
	modified:   fs/ext4/super.c
	modified:   fs/fat/namei_vfat.c
	modified:   fs/lockd/clntproc.c
	modified:   fs/nls/nls_base.c
	modified:   fs/notify/inotify/inotify_user.c
	modified:   fs/ocfs2/dlmglue.c
	modified:   include/linux/console.h
	modified:   include/linux/mmu_notifier.h
	modified:   include/linux/nls.h
	modified:   include/linux/usb/audio.h
	modified:   include/linux/vt_kern.h
	modified:   include/net/inet6_hashtables.h
	modified:   include/net/inet_sock.h
	modified:   include/net/ipv6.h
	modified:   kernel/hrtimer.c
	modified:   kernel/irq/spurious.c
	modified:   kernel/posix-cpu-timers.c
	modified:   kernel/timeconst.pl
	modified:   mm/fadvise.c
	modified:   mm/mmu_notifier.c
	modified:   mm/page_alloc.c
	modified:   mm/shmem.c
	modified:   net/bridge/br_stp_bpdu.c
	modified:   net/ipv4/af_inet.c
	modified:   net/ipv4/ping.c
	modified:   sound/pci/ali5451/ali5451.c
	modified:   sound/pci/rme32.c
	modified:   sound/usb/quirks-table.h