David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
arm	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
avr32	fixups for signal breakage	2012-06-04 17:47:34 -04:00
blackfin	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-06-05 09:47:15 -07:00
c6x	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
frv	frv: Remove bogus closing parenthesis	2012-06-02 10:38:19 -04:00
h8300	h8300: use the declarations provided by <asm/sections.h>	2012-06-20 14:39:35 -07:00
hexagon	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
m68k	m68knommu: define a local devm_clk_get() function	2012-06-25 09:17:20 +10:00
microblaze	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
mips	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
openrisc	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
parisc	[PARISC] fix code to find libgcc	2012-06-05 14:10:23 +09:00
powerpc	Merge git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-06-24 11:02:09 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
score	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
sh	Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus	2012-06-28 16:46:13 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
tile	tile: fix bug in get_user() for 4-byte values	2012-06-16 16:56:13 -04:00
um	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
unicore32	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
xtensa	xtensa: use the declarations provided by <asm/sections.h>	2012-06-20 14:39:35 -07:00
.gitignore
Kconfig	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-05-25 09:18:59 -07:00