# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   7thwojtoavpsp9ol
# target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/
# testament_sha1: df6e7a184bb9fbcb836a3652a8cfd53d9f9f2fe1
# timestamp: 2013-04-28 14:20:53 +0200
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2013-04-27 21:06:52 +0000
+++ ChangeLog	2013-04-28 12:12:49 +0000
@@ -1,3 +1,7 @@
+2013-04-28 Paul Menzel <address@hidden>
+
+	* AHCI: Put terms of `grub_ahci_hba_port_command` members in comments
+
 2013-04-27  Paulo Flabiano Smorigo <address@hidden>
 
 	* include/grub/macho.h: Set GRUB_MACHO_FAT_EFI_MAGIC as unsigned.

=== modified file 'grub-core/disk/ahci.c'
--- grub-core/disk/ahci.c	2013-04-27 19:49:14 +0000
+++ grub-core/disk/ahci.c	2013-04-28 12:12:49 +0000
@@ -74,12 +74,12 @@
 
 enum grub_ahci_hba_port_command
   {
-    GRUB_AHCI_HBA_PORT_CMD_ST  = 0x01,
-    GRUB_AHCI_HBA_PORT_CMD_SPIN_UP = 0x02,
-    GRUB_AHCI_HBA_PORT_CMD_POWER_ON = 0x04,
-    GRUB_AHCI_HBA_PORT_CMD_FRE = 0x10,
-    GRUB_AHCI_HBA_PORT_CMD_CR = 0x8000,
-    GRUB_AHCI_HBA_PORT_CMD_FR = 0x4000,
+    GRUB_AHCI_HBA_PORT_CMD_ST  = 0x01, /* Start */
+    GRUB_AHCI_HBA_PORT_CMD_SUD = 0x02, /* Spin-Up Device */
+    GRUB_AHCI_HBA_PORT_CMD_POWER_ON = 0x04, /* Power On Device (POD) */
+    GRUB_AHCI_HBA_PORT_CMD_FRE = 0x10, /* FIS Receive Enable */
+    GRUB_AHCI_HBA_PORT_CMD_CR = 0x8000, /* Command List Running  */
+    GRUB_AHCI_HBA_PORT_CMD_FR = 0x4000, /* FIS Receive Running */
   };
 
 struct grub_ahci_hba

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdRKy9cAAmnfgEAwUHf/93/n
3or////wUAV72c5w1LUg7rKdNsYSkIJoyZNJ+pMnoNBpkQNAaaaGmjQAJSTTKng1DyajU9QxMRoa
A0AAAABJCJoJPCp5T2UjCBoAAyA0aDRghxkyZMRiYATJgmQA0YRgCGASSCGgTQ1MaGiRtTao9T9C
mmynlP0ppo9RobUQKDd5zVjKSv/WXMbdIzqCTZyU89b3IVmhOyQxD6ZRA4Xp3863ujW767BYHMqY
YY9feL6KeNccC9oTN0LeY6p1TSOrVp7DRmfVZ92sPR0+I3NJrG1uDpj3lVkeOH6zdI8bycWWlobK
5GMDBfqXRllzvXhXtQjFIhkL+TVyiSiTJuZ7rsI8wwIGNBMVCjmAx3/bALtuJ70z6IBVljG61HIi
XkCr8xZNoS0TOomJmRHzGDTTsWXqkDTDTGRUrHfzkaB1sPRxKwclDfLRCq71CwgLRlXKFaElwG/K
OlXi1YOJnnHkwg3pbgWLePRw4rVEsaGQGLgVmEtb3JkK30U0Jg0d1dBPqrM1Bm0nR5SO3WUmQagk
f2e2YnJ5zRhxNpVmYa3YEFQx5shX7IA4oA9oFhtYnnU1wwDbbxcjMi3CTwILHVSiklNnK5wbPhPQ
H2ZCjlyA7ZMrRpgrtbBn6Cwd0sGPGCFZkVW2LhbaFgVGpbsoTsVFGrkfKRGGcKYMlUoKJweQiT5H
E8dMDUacorZ8pBxUX2FirI6ya0J9bN0OVWTxeFTzhTbDboR40fdF0mWQFo1jJZYyOcFIVjaktgBc
jXUVO13CwFkpYNsmnuKhRO+Aw/RQw/4LVSBNhIeT3rY5PgTsSHs6yvVFDrZruIGJ4D3V3tVqjRjK
UPPY6m4SREVNNURSpuJZgd3RYM1LDdI6Hv+87eCJkDeFJx4iduFZaMDH1F7C9HIKJX1z6uoUH3tb
stkrD+CYXMg6F0jCnY4nLuylzihpdE0n1srK22TrF1ivoHETHXPVhswFtYU/dVKm9YCtF6qwVNYn
2sdp0ngNqG3uR4n7c4h8DKReNAOwY5BQd7j5FhSeFkX+B8ZZOxG3dybpH8hK/QFo5yCiCzqvo0OS
niSGv4kfyA38+8+KY6jH0iXFRznLCWCDNy4i9FCHj43D697GvGqiYkRMux5TtjupvSmlF6MiS3G4
tlTLNvuq0EwRDIOzHUVX0IiUEuFyCXAhhRsDItasAsu3d7DkXM1hmuSmcxE05QpdiEUg+RUIEcho
JK72LNBVjMKisheffUz7kKxiBfO3NbQo1kYLDWTFbdekgWgrrzotHxd5sI2LnFIVkHJwxDEx0z7S
3qVgfY9x2F2LilmeWq7reyGHoPYSj/h/C6uQ2AubjvKktiPKnuu1gZ0SBxncZw0oNPAfo+VyGngx
ou0IkAjhElqlCOwSbZrbtVfjQtoSf2QMt0eKukxgMaYak7VgiYlIh3kE46kKDPHBJFTgxiKPJBRR
e6c+ClOJbUDFCIoK1vTik3EDCwdqkKaKrVUvq5Y0O2TFEDfO4gqQxLghQtvCay0J0qhPYTJj3OvB
5cBqRdYcDbpK0HaB+IE9CS62RYLudrQRLEXB5ranqvDz+m54Eb+jc4YOMymJQR1VGpFDH6Czhc0A
TJL2o1JQlnUgSIU2HAMsNNxH6wxdOrd2WU1NWuO3cTKhpgMNfGlNphPF1uG+hhqA7OHXlAoz10NS
juBsme7IcT4hUEZTkT1CBXLphEzNFLHUsQJYVXD/L1AtRUq7wcqGB03XBYThJY+Y+zHx4mmqwtT0
qgPwJZAHFJwFMi7tTGc5FeEhFP39n+LuSKcKEhqJWXrg