tmp_suning_uos_patched/arch
Mike Frysinger 222f6eb66e Blackfin: punt NFC MMR bits
Now that the NFC driver has its own defines, scrub the ones from the
global namespace to avoid ugly collisions with common code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-06 12:55:43 -04:00
..
alpha
arm Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 2010-08-05 15:59:48 -07:00
avr32 Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
blackfin Blackfin: punt NFC MMR bits 2010-08-06 12:55:43 -04:00
cris
frv Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
h8300
ia64 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-08-05 14:10:07 -07:00
m32r Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
m68k Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
m68knommu
microblaze Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
mips Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 2010-08-05 15:59:48 -07:00
mn10300
parisc parisc: pass through '\t' to early (iodc) console 2010-08-04 11:17:10 -07:00
powerpc Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 2010-08-05 15:59:48 -07:00
s390 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-08-05 14:10:07 -07:00
score Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
sh Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-08-04 15:31:02 -07:00
sparc Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
um Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-08-04 11:47:58 -07:00
x86 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 2010-08-05 15:59:48 -07:00
xtensa Merge remote branch 'origin/master' 2010-08-03 00:38:00 -07:00
.gitignore
Kconfig