]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 11 Feb 2007 19:37:45 +0000 (11:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 11 Feb 2007 19:37:45 +0000 (11:37 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Add PCI MSI support on Niagara.
  [SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
  [SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
  [PARTITION]: Add whole_disk attribute.

1  2 
fs/partitions/msdos.c
include/linux/genhd.h

Simple merge
index 7a566fad3f72f72a4ae6f350049536538c7df0cf,247734f7881fdd98d5b84ed3fb8415445a97b8fe..2c65da7cabb2a25acc1c42c067a3770872f29141
@@@ -20,9 -20,9 +20,11 @@@ enum 
        LINUX_EXTENDED_PARTITION = 0x85,
        WIN98_EXTENDED_PARTITION = 0x0f,
  
+       SUN_WHOLE_DISK = DOS_EXTENDED_PARTITION,
        LINUX_SWAP_PARTITION = 0x82,
 +      LINUX_DATA_PARTITION = 0x83,
 +      LINUX_LVM_PARTITION = 0x8e,
        LINUX_RAID_PARTITION = 0xfd,    /* autodetect RAID partition */
  
        SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION,