diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/magic-number.txt | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/magic-number.txt')
| -rw-r--r-- | Documentation/magic-number.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt index 505f19607542..4b12abcb2ad3 100644 --- a/Documentation/magic-number.txt +++ b/Documentation/magic-number.txt | |||
| @@ -150,7 +150,7 @@ NBD_REPLY_MAGIC 0x96744668 nbd_reply include/linux/nbd.h | |||
| 150 | STL_BOARDMAGIC 0xa2267f52 stlbrd include/linux/stallion.h | 150 | STL_BOARDMAGIC 0xa2267f52 stlbrd include/linux/stallion.h |
| 151 | ENI155_MAGIC 0xa54b872d midway_eprom drivers/atm/eni.h | 151 | ENI155_MAGIC 0xa54b872d midway_eprom drivers/atm/eni.h |
| 152 | SCI_MAGIC 0xbabeface gs_port drivers/char/sh-sci.h | 152 | SCI_MAGIC 0xbabeface gs_port drivers/char/sh-sci.h |
| 153 | CODA_MAGIC 0xC0DAC0DA coda_file_info include/linux/coda_fs_i.h | 153 | CODA_MAGIC 0xC0DAC0DA coda_file_info fs/coda/coda_fs_i.h |
| 154 | DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram drivers/scsi/gdth.h | 154 | DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram drivers/scsi/gdth.h |
| 155 | STLI_PORTMAGIC 0xe671c7a1 stliport include/linux/istallion.h | 155 | STLI_PORTMAGIC 0xe671c7a1 stliport include/linux/istallion.h |
| 156 | YAM_MAGIC 0xF10A7654 yam_port drivers/net/hamradio/yam.c | 156 | YAM_MAGIC 0xF10A7654 yam_port drivers/net/hamradio/yam.c |