John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

2011-11-22 14:05:46 -05:00

..

alpha

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

arm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

avr32

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

blackfin

blackfin: Fixup export.h includes

2011-11-14 17:15:23 +08:00

cris

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

frv

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

h8300

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

hexagon

Hexagon: Add basic stacktrace functionality for Hexagon architecture.

2011-11-01 07:34:21 -07:00

ia64

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

m32r

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

m68k

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

microblaze

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mips

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

mn10300

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

openrisc

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2011-11-06 18:54:53 -08:00

parisc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

powerpc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

s390

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

score

score: drop unused Kconfig symbols

2011-10-31 23:39:51 +01:00

sh

Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus

2011-11-11 16:16:25 +09:00

sparc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

tile

Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile

2011-11-04 12:33:34 -07:00

um

Merge branch 'for-linus' of git://github.com/richardweinberger/linux

2011-11-02 09:45:39 -07:00

unicore32

unicore32: EXPORT_SYMBOL needs export.h

2011-10-31 19:31:06 -04:00

x86

bma023: Add SFI translation for this device

2011-11-11 23:58:58 -02:00

xtensa

net: add wireless TX status socket option

2011-11-09 16:01:02 -05:00

.gitignore

…

Kconfig

Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG

2011-08-03 11:12:37 -04:00