Switched to branch "2.6.27-rc6-mc3" From /pub/scm/linux/kernel/git/torvalds/linux-2.6 6bfb09a..bc45eb8 master -> linus From . * branch linus -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103. kernel/git/sfr/linux-next.git linux-next ## Using 2.6.27-rc6-mc3 ## # git /pub/scm/linux/kernel/git/torvalds/linux-2.6.git master linus ## Auto-merged MAINTAINERS Auto-merged arch/sparc64/kernel/pci_psycho.c Auto-merged arch/sparc64/kernel/ptrace.c Auto-merged drivers/memstick/core/mspro_block.c CONFLICT (content): Merge conflict in drivers/memstick/core/mspro_block.c Auto-merged drivers/net/niu.c Auto-merged drivers/net/wireless/ath9k/beacon.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/beacon.c Auto-merged drivers/net/wireless/ath9k/core.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/core.h Auto-merged drivers/net/wireless/ath9k/main.c Auto-merged drivers/pci/probe.c CONFLICT (content): Merge conflict in drivers/pci/probe.c Auto-merged drivers/pcmcia/soc_common.c Auto-merged drivers/spi/pxa2xx_spi.c CONFLICT (content): Merge conflict in drivers/spi/pxa2xx_spi.c Auto-merged drivers/video/atmel_lcdfb.c Auto-merged fs/bfs/dir.c Auto-merged fs/partitions/check.c Auto-merged fs/proc/proc_misc.c Auto-merged include/linux/ata.h Auto-merged include/linux/ioport.h Auto-merged include/linux/mmzone.h Auto-merged include/net/netlink.h Auto-merged net/bluetooth/hci_core.c Automatic merge failed; fix conflicts and then commit the result.