Linus Torvalds
768cbfbc52
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
2005-05-16 10:34:52 -07:00
Linus Torvalds
2a4a7e02e2
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-05-16 10:27:11 -07:00
Linus Torvalds
88d7bd8cb9
Linux v2.6.12-rc4
2005-05-06 22:20:31 -07:00
Linus Torvalds
07342d623b
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
2005-05-06 16:46:40 -07:00
Linus Torvalds
d4a1a7322c
Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
2005-05-06 15:41:11 -07:00
Linus Torvalds
22490eb80c
Fix acpi_find_rsdp() - acpi_scan_rsdp takes length, not end
...
Noticed by Jakub Jermar <[email protected]
2005-05-06 15:39:23 -07:00
Linus Torvalds
47c297529b
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
2005-05-05 16:23:24 -07:00
Linus Torvalds
fd4e5f29f7
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
2005-05-05 16:22:23 -07:00
Linus Torvalds
4adb18173a
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-05-05 16:06:47 -07:00
Linus Torvalds
897f5ab2cd
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
2005-05-04 19:52:45 -07:00
Linus Torvalds
1d42a0ecf4
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/
2005-05-04 14:23:14 -07:00
Linus Torvalds
e6600d800f
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
2005-05-04 07:08:43 -07:00
Linus Torvalds
a1d4ebdbb3
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
2005-05-04 07:08:10 -07:00
Linus Torvalds
742b0c905d
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6.git/
2005-05-04 07:07:22 -07:00
Linus Torvalds
235bd6140d
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
2005-05-04 07:06:38 -07:00
Linus Torvalds
8800cea620
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
2005-05-03 17:24:08 -07:00
Linus Torvalds
84e48b6d64
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-05-03 15:27:24 -07:00
Linus Torvalds
1d651f3332
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-30 15:42:33 -07:00
Linus Torvalds
49e7dc54cd
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-30 13:34:21 -07:00
Linus Torvalds
a6ad57fb4b
Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
2005-04-29 15:08:34 -07:00
Linus Torvalds
dd96a8e056
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-29 15:06:00 -07:00
Linus Torvalds
a879cbbb34
x86: make traps on 'iret' be debuggable in user space
...
This makes a trap on the 'iret' that returns us to user space
cause a nice clean SIGSEGV, instead of just a hard (and silent)
exit.
That way a debugger can actually try to see what happened, and
we also properly notify everybody who might be interested about
us being gone.
This loses the error code, but tells the debugger what happened
with ILL_BADSTK in the siginfo.
2005-04-29 09:38:44 -07:00
Linus Torvalds
c06fec5022
Remove bogus BUG() in kernel/exit.c
...
It's old sanity checking that may have been useful for debugging, but
is just bogus these days.
Noticed by Mattia Belletti.
2005-04-29 09:37:07 -07:00
Linus Torvalds
2604f6da1a
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-28 16:09:57 -07:00
Linus Torvalds
fc67b16eca
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
2005-04-27 10:05:42 -07:00
Linus Torvalds
97af11286d
Automatic merge of kernel.org:/home/rmk/linux-2.6-serial.git
2005-04-26 09:02:40 -07:00
Linus Torvalds
1e14c33fe2
Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-26 08:58:22 -07:00
Linus Torvalds
99805f47dd
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
2005-04-26 07:22:55 -07:00
Linus Torvalds
a1342206e1
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
2005-04-26 07:19:05 -07:00
Linus Torvalds
ab2fd30b66
Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-25 16:19:32 -07:00
Linus Torvalds
cf025109e8
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
2005-04-25 07:42:22 -07:00
Linus Torvalds
21b7ef0c6c
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
2005-04-22 10:18:06 -07:00
Linus Torvalds
8d134db051
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
2005-04-21 14:02:34 -07:00
Linus Torvalds
6d9c5d94d3
Merge rsync://rsync.kernel.org/pub/linux/kernel/people/davem/sparc-2.6.git
2005-04-21 07:36:42 -07:00
Linus Torvalds
a2755a80f4
Linux v2.6.12-rc3
...
Releasing this will also make "git" the official source control
thing. Here's to hoping for the best.
2005-04-20 16:24:21 -07:00
Linus Torvalds
9f6c6fc505
Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
...
for 13 driver core, sysfs, and debugfs fixes.
2005-04-19 13:14:28 -07:00
Linus Torvalds
c3c661932c
Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
...
for 11 aoe bugfix patches.
2005-04-19 13:12:03 -07:00
Linus Torvalds
c79bea07ec
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
2005-04-19 07:31:40 -07:00
Linus Torvalds
a9e4820c4c
Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
...
Yah, it does work to merge. Knock wood.
2005-04-19 07:28:57 -07:00
Linus Torvalds
7f907d7486
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git
...
This adds the missing arch/arm/lib/bitops.h file.
2005-04-18 16:25:10 -07:00
Linus Torvalds
0b2cad2f30
Merge SCSI tree from James Bottomley.
...
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.
2005-04-18 14:25:40 -07:00
Linus Torvalds
a4e884a311
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
...
First ever true git merge. Let's see if it actually works.
2005-04-17 14:47:24 -07:00
Linus Torvalds
ce1dc02f76
Fix up some file mode differences due to the new git world order.
2005-04-17 13:30:46 -07:00
Linus Torvalds
1da177e4c3
Linux-2.6.12-rc2
...
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.
Let it rip!
2005-04-16 15:20:36 -07:00
Linus Torvalds