← Back to branch summary

~colinb/grub/cdbmain

~colinb/grub/cdbmain

« back to all changes in this revision

Viewing changes to disk/ata.c

Committer: Colin D Bennett
Date: 2008-08-03 03:57:46 UTC
mfrom: (820.8.1 trunk-clean)
Revision ID: colin@gibibit.com-20080803035746-0zn13x8oznory84l

Merge trunk.

files added:
include/grub/bufio.h

io/bufio.c

files renamed:
include/grub/bufio.h => include/grub/bufio.h.moved

io/bufio.c => io/bufio.c.moved

files modified:
ChangeLog

autogen.sh

boot/i386/pc/lnxboot.S

conf/i386-coreboot.rmk

conf/i386-ieee1275.rmk

conf/powerpc-ieee1275.rmk

disk/ata.c

disk/memdisk.c

disk/raid.c

genmk.rb

include/grub/i386/coreboot/kernel.h

include/grub/i386/ieee1275/kernel.h

include/grub/i386/loader.h

include/grub/i386/pc/kernel.h

include/grub/kernel.h

include/grub/powerpc/ieee1275/kernel.h

kern/device.c

kern/i386/ieee1275/startup.S

kern/i386/linuxbios/init.c

kern/i386/linuxbios/startup.S

kern/i386/loader.S

kern/i386/pc/init.c

kern/i386/pc/startup.S

kern/ieee1275/init.c

kern/main.c

loader/i386/pc/multiboot.c

normal/main.c

normal/menu_entry.c

partmap/apple.c

term/i386/pc/vga_text.c

util/elf/grub-mkimage.c

util/grub.d/10_hurd.in

util/grub.d/10_linux.in

util/i386/efi/grub-mkimage.c

util/i386/pc/grub-install.in

util/i386/pc/grub-mkimage.c

util/i386/pc/grub-setup.c

util/update-grub.in

util/update-grub_lib.in

Show diffs side-by-side

added added

removed removed

1

1

/* ata.c - ATA disk access. */

2

2

/*

3

3

* GRUB -- GRand Unified Bootloader

4

* Copyright (C) 2007 Free Software Foundation, Inc.

4

* Copyright (C) 2007, 2008 Free Software Foundation, Inc.

5

5

*

6

6

* GRUB is free software: you can redistribute it and/or modify

7

7

* it under the terms of the GNU General Public License as published by

Older »