android_kernel_sony_msm8994/drivers/block/drbd
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
drbd_actlog.c drbd: remove tracing bits 2009-10-01 21:17:58 +02:00
drbd_bitmap.c
drbd_int.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
drbd_main.c drbd: fix max_segment_size initialization 2010-01-22 11:34:54 +01:00
drbd_nl.c block: Consolidate phys_segment and hw_segment limits 2010-02-26 13:58:08 +01:00
drbd_proc.c drbd: Constify struct file_operations 2009-12-21 12:45:15 +01:00
drbd_receiver.c drbd: null dereference bug 2010-01-25 18:01:41 +01:00
drbd_req.c drbd_req.c: use part_[inc|dec]_in_flight() 2009-12-03 17:40:51 +01:00
drbd_req.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
drbd_strings.c
drbd_vli.h
drbd_worker.c drbd: remove unused #include <linux/version.h> 2009-12-21 13:41:16 +01:00
drbd_wrappers.h
Kconfig drbd: Kconfig fix 2009-12-29 17:38:28 +01:00
Makefile drbd: remove tracing bits 2009-10-01 21:17:58 +02:00