Merge remote-tracking branch 'h8300-remove/h8300-remove'

Conflicts:
	drivers/parport/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/parport/Kconfig
index f5366850af7abe54ccece332e72853e8338e5cea,dc82ef096f3ba61267484057b083caed92748d5b..2225237ff63f64a70f6b005f418d7e3de3c5ef93
--- 1/drivers/parport/Kconfig
--- 2/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@@ -41,8 -35,10 +41,7 @@@ if PARPOR
  
  config PARPORT_PC
        tristate "PC-style hardware"
 -      depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
 -              (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
 -              !XTENSA && !CRIS
 -
 +      depends on ARCH_MIGHT_HAVE_PC_PARPORT
- 
        ---help---
          You should say Y here if you have a PC-style parallel port. All
          IBM PC compatible computers and some Alphas have PC-style