David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/firmware/iscsi_ibft.c		2010-02-28 19:23:06 -08:00
..
boot	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
configs	xtensa: enable m41t80 driver in s6105_defconfig	2009-06-22 02:38:11 -07:00
include/asm	Merge branch 'for-33' of git://repo.or.cz/linux-kbuild	2009-12-17 07:23:42 -08:00
kernel	resource/PCI: mark struct resource as const	2010-02-22 16:16:57 -08:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	arches: drop superfluous casts in nr_free_pages() callers	2009-09-22 07:17:34 -07:00
platforms	net: use netdev_mc_count and netdev_mc_empty when appropriate	2010-02-12 11:38:58 -08:00
variants	xtensa: support s6000 gpio irqs and alternate function selection	2009-06-22 02:37:26 -07:00
Kconfig	xtensa: implement ccount calibration for s6000	2009-05-11 22:00:17 -07:00
Kconfig.debug
Makefile	xtensa: only build platform or variant if they contain a Makefile	2009-04-03 00:06:45 -07:00