redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity
remarkable-linux/drivers
History
Len Brown bd6dbdf3c7 When a merge does not work automatically, git prevents 
commit from running until a change has been made in
the destination.  In this instance the desired result
was to choose the destination version of the file
and ignore the source version, but git would not
allow that.

Here I added a blank line to let git commit think
I resolved a merge conflict.
2005-08-04 00:17:42 -04:00
..
acorn Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
acpi When a merge does not work automatically, git prevents 2005-08-04 00:17:42 -04:00
atm [ATM]: [drivers] kill pointless NULL checks and casts before kfree() 2005-06-02 13:04:07 -07:00
base [ACPI] ACPI poweroff fix 2005-07-11 23:20:49 -04:00
block When cfq I/O scheduler is selected, get_request() in __make_request() calls 2005-06-17 16:15:10 +02:00
bluetooth Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cdrom [PATCH] ppc64 iSeries: make virtual DVD-RAMs writable again 2005-05-28 11:14:00 -07:00
char Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2005-06-10 20:23:21 -07:00
cpufreq [PATCH] cpufreq-stats driver updates 2005-05-31 19:04:05 -07:00
crypto Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dio Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
eisa Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fc4 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
firmware [PATCH] pcdp.c build fix 2005-05-31 14:54:18 -07:00
i2c [PATCH] I2C: ALI1563 SMBus driver fix 2005-05-31 14:03:05 -07:00
ide [PATCH] PCI: amd74xx patch for new NVIDIA device IDs 2005-05-31 14:26:38 -07:00
ieee1394 [PATCH] sbp2 slab corruption fix 2005-06-16 09:02:59 -07:00
infiniband [PATCH] IB: fix endianness of path record MTU field 2005-05-25 15:31:28 -07:00
input [PATCH] ALPS: fix enabling hardware tapping 2005-06-16 09:02:59 -07:00
isdn [PATCH] make lots of things static 2005-05-01 08:59:29 -07:00
macintosh [PATCH] ppc32: Fix nasty sleep/wakeup problem 2005-06-09 21:33:35 -07:00
mca Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
md [PATCH] dm: Handle READA requests in dm-mpath.c 2005-06-08 16:21:14 -07:00
media [PATCH] dvb: Small cleanup 2005-05-28 16:46:10 -07:00
message [PATCH] i2o: Fix free of event memory in i2o_block_event() 2005-06-14 07:19:35 -07:00
misc Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mmc [PATCH] MMC: Proper MMC command classes support 2005-05-21 10:27:02 +01:00
mtd [PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi 2005-04-16 15:25:29 -07:00
net [ACPI] fix resume issues on Asus L5D 2005-07-29 22:04:26 -04:00
nubus Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
oprofile [PATCH] oprofile trivial user annotations 2005-04-26 07:43:42 -07:00
parisc Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
parport [PATCH] ISA_DMA Kconfig fixes - part 2 (parport_pc) 2005-05-04 07:33:13 -07:00
pci cleanup: remove unnecessary initializer on static pointers 2005-07-11 23:56:26 -04:00
pcmcia [ACPI] fix resume issues on Asus L5D 2005-07-29 22:04:26 -04:00
pnp [ACPI] PNPACPI vs sound IRQ 2005-07-12 00:03:30 -04:00
s390 Automatic merge of /spare/repo/netdev-2.6 branch qeth 2005-05-25 22:11:06 -04:00
sbus [SPARC]: Eliminate local MIN/MAX macros in drivers/sbus/char/aurora.c 2005-05-15 16:01:50 -07:00
scsi [PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken 2005-06-12 20:43:22 -07:00
serial [PATCH] Serial: remove unused variable in sa1100 driver 2005-06-08 19:26:47 +01:00
sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sn Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tc Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
telephony [PATCH] ixj* - compile warning cleanup 2005-05-05 16:36:48 -07:00
usb [ACPI] S3 Suspend to RAM: fix driver suspend/resume methods 2005-07-11 23:23:46 -04:00
video [PATCH] macmodes: needs a license 2005-06-14 07:19:35 -07:00
w1 [PATCH] w1_smem: w1 ID is only 8 bytes long. 2005-04-18 21:16:57 -07:00
zorro Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00