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
..
efi	efi-pstore: Make efi-pstore return a unique id	2013-11-29 10:11:06 +00:00
google	DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks	2013-10-31 14:49:17 +00:00
dcdbas.c	DMA-API: dcdbas: update DMA mask handing	2013-10-31 14:49:16 +00:00
dcdbas.h
dell_rbu.c
dmi_scan.c	dmi: Avoid unaligned memory access in save_mem_devices()	2013-11-03 10:40:12 +01:00
dmi-id.c
dmi-sysfs.c	firmware: dmi-sysfs: Remove "dmi" directory on module exit	2013-12-08 18:23:42 -08:00
edd.c	[SCSI] edd: Treat "XPRS" host bus type the same as "PCI"	2011-10-31 13:26:19 +04:00
iscsi_ibft_find.c	efi: Make 'efi_enabled' a function to query EFI facilities	2013-01-30 11:51:59 -08:00
iscsi_ibft.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
Kconfig	dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly	2013-06-03 13:57:29 -07:00
Makefile	efi: split efisubsystem from efivars	2013-04-17 13:27:06 +01:00
memmap.c	firmware, memmap: fix firmware_map_entry leak	2013-04-29 15:54:38 -07:00
pcdp.c	pcdp: use early_ioremap/early_iounmap to access pcdp table	2012-07-30 17:25:11 -07:00
pcdp.h