Tejun Heo 13ccb93f41 Merge branch 'driver-core-linus' into driver-core-next ... a8b1474442 ("sysfs: give different locking key to regular and bin files") in driver-core-linus modifies sysfs_open_file() so that it gives out different locking classes to sysfs_open_files depending on whether the file is bin or not. Due to the massive kernfs reorganization in driver-core-next, this naturally causes merge conflict in fs/sysfs/file.c. Due to the way things are split between kernfs and sysfs in driver-core-next, the same fix can't easily be applied to driver-core-next. This merge simply ignores the offending commit. A following patch will implement a separate fix for the issue. Signed-off-by: Tejun Heo <tj@kernel.org>		2013-12-10 08:44:37 -05:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha	2013-11-20 15:03:45 -08:00
arc	Final set of ARC changes for 3.13-rc1	2013-11-19 11:44:15 -08:00
arm	ARM: SoC fixes for 3.13-rc	2013-12-04 08:56:18 -08:00
arm64	arm64: Move PTE_PROT_NONE higher up	2013-11-29 15:22:59 +00:00
avr32	avr32: uapi: be sure of "_UAPI" prefix for all guard macros	2013-11-20 09:53:22 +01:00
blackfin	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
c6x	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
cris	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
frv	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
hexagon	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-11-20 14:25:39 -08:00
m32r	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
m68k	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
metag	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
microblaze	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mips	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mn10300	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
openrisc	OpenRISC updates for 3.13	2013-11-15 14:26:38 -08:00
parisc	parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver	2013-12-03 23:23:35 +01:00
powerpc	arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow	2013-11-25 11:50:57 +11:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-12-04 08:53:09 -08:00
score	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sh	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2013-11-19 15:50:03 -08:00
tile	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
um	um: Build always with -mcmodel=large on 64bit	2013-12-01 13:06:51 +01:00
unicore32	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
x86	Merge branch 'driver-core-linus' into driver-core-next	2013-12-10 08:44:37 -05:00
xtensa	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
.gitignore
Kconfig	kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS	2013-11-15 09:32:22 +09:00