- Updated to 2.6.39-rc3.

  - Eliminated 2 patches.

suse-commit: 200c913d1e0a297c9efe99d36d5c2b4a6cd6ef79

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/macintosh/adbhid.c
Simple merge

diff --cc drivers/md/dm-region-hash.c
Simple merge

diff --cc drivers/media/dvb/b2c2/flexcop-pci.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/net/tg3.h
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/scsi/device_handler/scsi_dh_alua.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_mbox.c
Simple merge

diff --cc drivers/scsi/scsi_netlink.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
Simple merge

diff --cc drivers/tty/serial/8250.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc drivers/video/console/fbcon.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/partitions/check.c
Simple merge

diff --cc fs/reiserfs/super.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/fb.h
index 71ee00a,df728c1..454441d
--- 1/include/linux/fb.h
--- 2/include/linux/fb.h
+++ b/include/linux/fb.h
@@@ -877,11 -877,7 +877,11 @@@ struct fb_info 
        void *fbcon_par;                /* fbcon use-only private area */
        /* From here on everything is device dependent */
        void *par;
 +#ifdef CONFIG_BOOTSPLASH
 +      struct splash_data *splash_data;
 +      char fb_cursordata[64];
 +#endif
-       /* we need the PCI or similiar aperture base/size not
+       /* we need the PCI or similar aperture base/size not
           smem_start/size as smem_start may just be an object
           allocated inside the aperture so may not actually overlap */
        struct apertures_struct {

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/tracehook.h
Simple merge

diff --cc init/do_mounts.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/netfilter/Kconfig
Simple merge

diff --cc scripts/Makefile.modpost
Simple merge

diff --cc security/apparmor/match.c
Simple merge

diff --cc security/apparmor/policy_unpack.c
Simple merge