Was Water-Boarding acceptable method by international conference?

I heard on a talk show that one of the ways to get information of the where-abouts of Osama Bin Laden was through the usage of water-boarding.The speculation is that water-boarding was not permissible by the Geneva Convention. This is controversial argument. What do you think?